Update reading Stackify.json

get the base path when reading stackify.json
add support for ASPNETCORE_ENVIRONMENT when setting environmentName.

Author: marc

Src/StackifyLib/Config.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using Newtonsoft.Json.Linq;
 using StackifyLib.Utils;
 
@@ -202,6 +203,34 @@ internal static string Get(string key, string defaultValue = null)
             return v;
         }
 
+        public static void ReadStackifyJSONConfig()
+        {
+            try
+            {
+                string baseDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+                string jsonPath = Path.Combine(baseDirectory, "Stackify.json");
+
+                string json;
+
+                using (var fs = new FileStream(jsonPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                {
+                    using (var sr = new StreamReader(fs))
+                    {
+                        json = sr.ReadToEnd();
+                    }
+                }
+
+                var obj = JObject.Parse(json, Settings);
+                Config.SetStackifyObj(obj);
+            }
+            catch (Exception ex)
+            {
+                StackifyAPILogger.Log("#Config #ReadStackifyJSONConfig failed", ex);
+            }
+            
+        }
+
+#if JSONTEST
         public static void ReadStackifyJSONConfig(string filePath)
         {
             try
@@ -225,11 +254,12 @@ public static void ReadStackifyJSONConfig(string filePath)
             }
 
         }
+#endif
 
         public static void SetStackifyObj(JObject obj)
         {
             AppName = TryGetValue(obj, "AppName") ?? AppName;
-            Environment = TryGetValue(obj, "Environment") ?? Environment;
+            Environment = GetEnvironment(obj);
             ApiKey = TryGetValue(obj, "ApiKey") ?? ApiKey;
         }
 
@@ -261,5 +291,17 @@ private static string TryGetValue(JToken jToken, string key)
 
             return r;
         }
+        public static string GetEnvironment(JObject envName)
+        {
+            var environmentName = System.Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT");
+            if (!String.IsNullOrEmpty(environmentName))
+            {
+                return environmentName;
+            }
+
+            environmentName = TryGetValue(envName, "Environment") ?? Environment;
+
+            return environmentName;
+        }
     }
 }

samples/CoreConsoleApp/Program.cs

@@ -38,7 +38,7 @@ static void Main(string[] args)
 
             string filePath = "C:\\Source\\stackify-api-dotnet\\samples\\CoreConsoleApp\\Stackify.json";
 
-            Config.ReadStackifyJSONConfig(filePath);
+            Config.ReadStackifyJSONConfig();
 
             //NLogTest();
             Console.WriteLine($"Stackify Config AppName: {StackifyLib.Config.AppName}");

samples/CoreWebApp/Startup.cs

@@ -41,7 +41,7 @@ public Startup(IHostingEnvironment env)
 
             string filePath = "C:\\Source\\stackify-api-dotnet\\samples\\CoreWebApp\\Stackify.json";
 
-            Config.ReadStackifyJSONConfig(filePath);
+            Config.ReadStackifyJSONConfig();
             Debug.WriteLine(StackifyLib.Config.AppName);
             Debug.WriteLine(StackifyLib.Config.Environment);
             Debug.WriteLine(StackifyLib.Config.ApiKey);

test/StackifyLib.UnitTests/ConfigJSON_Tests.cs

@@ -24,7 +24,7 @@ public ConfigJSON_Tests(ITestOutputHelper output)
             this.output = output;
         }
 
-
+#if JSONTEST
         [Fact]
         public void Should_Ignore_Invalid_Format_Json_File()
         {
@@ -121,5 +121,7 @@ private void ResetConfig()
             StackifyLib.Config.Environment = Environment;
             StackifyLib.Config.ApiKey = ApiKey;
         }
+#endif
     }
+
 }