Merge pull request #120 from homiedopie/feature/DOTNET-89

DOTNET-89 - Improve logger and config loading and environment detail

Author: homiedopie

Src/StackifyLib/Config.cs

@@ -38,6 +38,7 @@ public static void LoadSettings()
             try
             {
                 if (IsStackifyJsonLoaded == false) {
+                    StackifyAPILogger.Log($"#Config - LoadSettings - Stackify JSON - Read");
                     ReadStackifyJSONConfig(); // TODO: Better way?
                 }
 
@@ -155,6 +156,15 @@ public static void LoadSettings()
             {
                 StackifyAPILogger.Log("#Config #LoadSettings failed", ex);
             }
+
+            try
+            {
+                StackifyAPILogger.EvaluateLogEnabled();
+            }
+            catch (Exception ex)
+            {
+                StackifyAPILogger.Log("#Config #LoadSettings StackifyAPILogger.EvaluateLogEnabled failed", ex);
+            }
         }
 
         public static string ApiKey { get; set; }
@@ -299,7 +309,7 @@ public static void ReadStackifyJSONConfig()
         {
             try
             {
-                var ASPEnvironment = System.Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? "Production";
+                var ASPEnvironment = System.Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT");
                 var DotnetEnvironment = System.Environment.GetEnvironmentVariable("DOTNET_ENVIRONMENT");
                 string baseDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
                 string jsonPath = string.Empty;
@@ -318,6 +328,7 @@ public static void ReadStackifyJSONConfig()
                     jsonPath = Path.Combine(baseDirectory, "Stackify.json");
                 }
 
+                StackifyAPILogger.Log($"#Config #Json Load - Path: {jsonPath}");
                 if (File.Exists(jsonPath))
                 {
                     using (var fs = new FileStream(jsonPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
@@ -350,6 +361,7 @@ public static void ReadStackifyJSONConfig()
                         iisJsonPath = Path.Combine(iisBaseDirectory, "Stackify.json");
                     }
 
+                    StackifyAPILogger.Log($"#Config #Json Load - Path: {iisJsonPath}");
                     if (File.Exists(iisJsonPath))
                     {
                         using (var fs = new FileStream(iisJsonPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
@@ -427,6 +439,7 @@ public static void SetStackifyObj(JObject obj)
             AppName = TryGetValue(obj, "AppName") ?? AppName;
             Environment = TryGetValue(obj, "Environment") ?? Environment;
             ApiKey = TryGetValue(obj, "ApiKey") ?? ApiKey;
+            StackifyAPILogger.Log($"#Config #Json #SetStackifyObj Load - AppName: {AppName} - Environment: {Environment} - ApiKey: {ApiKey}");
         }
 
         private static string TryGetValue(JToken jToken, string key)
@@ -449,6 +462,7 @@ private static string TryGetValue(JToken jToken, string key)
                 }
 
                 r = val.ToString();
+                StackifyAPILogger.Log($"#Config #TryGetValue #Json Success - Key: {key} - Value: {r ?? "Empty"}");
             }
             catch (Exception ex)
             {

Src/StackifyLib/Models/EnvironmentDetail.cs

@@ -490,5 +490,37 @@ public string AppNameToUse()
 
             return AppName;
         }
+
+        public void UpdateAppName()
+        {
+            if (!string.IsNullOrEmpty(ConfiguredAppName))
+            {
+                return;
+            }
+            
+            if (!string.IsNullOrEmpty(Config.AppName))
+            {
+                ConfiguredAppName = Config.AppName;
+                return;
+            }
+
+            ConfiguredAppName = Config.Get("Stackify.AppName");
+        }
+
+        public void UpdateEnvironmentName()
+        {
+            if (!string.IsNullOrEmpty(ConfiguredEnvironmentName))
+            {
+                return;
+            }
+            
+            if (!string.IsNullOrEmpty(Config.Environment))
+            {
+                ConfiguredEnvironmentName = Config.Environment;
+                return;
+            }
+
+            ConfiguredEnvironmentName = Config.Get("Stackify.Environment");
+        }
     }
 }

Src/StackifyLib/Utils/HttpClient.cs

@@ -302,6 +302,16 @@ public bool IdentifyApp()
                 }
                 StackifyAPILogger.Log("Calling to Identify App");
                 EnvironmentDetail env = EnvironmentDetail.Get();
+                env.UpdateEnvironmentName();
+                env.UpdateAppName();
+                if (string.IsNullOrEmpty(env.ConfiguredAppName) && !string.IsNullOrEmpty(Config.AppName)) {
+                    env.ConfiguredAppName = Config.AppName;
+                }
+
+                if (string.IsNullOrEmpty(env.ConfiguredEnvironmentName) && !string.IsNullOrEmpty(Config.Environment)) {
+                    env.ConfiguredAppName = Config.Environment;
+                }
+
                 string jsonData = JsonConvert.SerializeObject(env, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore });
 
                 var response =

Src/StackifyLib/Utils/StackifyAPILogger.cs

@@ -19,7 +19,6 @@ public class StackifyAPILogger
 
         static StackifyAPILogger()
         {
-            EvaluateLogEnabled();
         }
 
         public static bool LogEnabled
@@ -85,7 +84,7 @@ public static void Log(string message, Exception ex, bool logAnyways = false)
             }
         }
 
-        private static void EvaluateLogEnabled()
+        public static void EvaluateLogEnabled()
         {
             if (_logEnabled == null)
             {