Merge pull request #98 from marcdemz/origin/bug/RT-4457

RT-4457 Update EnvironmentDetail.cs

Author: mattjbrooksii

Src/StackifyLib/Models/EnvironmentDetail.cs

@@ -129,7 +129,7 @@ public static string GetDeviceName()
                 }
             }
 
-            return deviceName;
+            return deviceName.Substring(0, deviceName.Length > 60 ? 60 : deviceName.Length);
         }
 
         public static string GetEC2InstanceId()
@@ -215,7 +215,7 @@ public static string GetDeviceName()
                 }
             }
 
-            return deviceName;
+            return deviceName.Substring(0, deviceName.Length > 60 ? 60 : deviceName.Length);
         }
 
         public static async Task<string> GetEC2InstanceId()
@@ -233,6 +233,11 @@ public static async Task<string> GetEC2InstanceId()
                 {
                     string id = await content.Content.ReadAsStringAsync();
                     r = string.IsNullOrWhiteSpace(id) ? null : id;
+
+                    if (r.Contains("html"))
+                    {
+                        r = Environment.MachineName;
+                    }
                 }
 
             }