Updated to support DOTNET_ENVIRONMENT

Updated to support DOTNET_ENVIRONMENT
updated support of reading settings from Stackify.json for LoadSettings.

Author: marc

Src/StackifyLib/Config.cs

@@ -176,6 +176,14 @@ internal static string Get(string key, string defaultValue = null)
                     {
                         var appSettings = _configuration.GetSection("Stackify");
                         v = appSettings[key.Replace("Stackify.", string.Empty)];
+
+                        //Get settings from Stackify.json
+                        if (string.IsNullOrEmpty(v))
+                        {
+                            var key2 = key.Replace("Stackify.", string.Empty);
+                            var stackifyJson = _configuration.GetSection(key2);
+                            v = stackifyJson.Value;
+                        }
                     }
 #endif
 
@@ -291,17 +299,26 @@ private static string TryGetValue(JToken jToken, string key)
 
             return r;
         }
-        public static string GetEnvironment(JObject envName)
+        public static string GetEnvironment(JObject envName = null)
         {
-            var environmentName = System.Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT");
-            if (!String.IsNullOrEmpty(environmentName))
+            var ASPEnvironment = System.Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT");
+            var DotnetEnvironment = System.Environment.GetEnvironmentVariable("DOTNET_ENVIRONMENT");
+
+            if (!String.IsNullOrEmpty(ASPEnvironment))
             {
-                return environmentName;
+                return ASPEnvironment;
             }
+            else if (!String.IsNullOrEmpty(DotnetEnvironment))
+            {
+                return DotnetEnvironment;
+            }
+            else
+            {
+                var environmentName = TryGetValue(envName, "Environment") ?? Environment;
 
-            environmentName = TryGetValue(envName, "Environment") ?? Environment;
-
-            return environmentName;
+                return environmentName;
+            }
+            
         }
     }
 }

samples/CoreConsoleApp/Program.cs

@@ -19,12 +19,11 @@ namespace CoreConsoleApp
 {
     public class Program
     {
-        private static readonly JsonLoadSettings Settings = new JsonLoadSettings { CommentHandling = CommentHandling.Ignore, LineInfoHandling = LineInfoHandling.Ignore };
         static void Main(string[] args)
         {
             var builder = new ConfigurationBuilder()
                .SetBasePath(Directory.GetCurrentDirectory())
-               .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true);
+               .AddJsonFile("Stackify.json", optional: true, reloadOnChange: true);
 
             var config = builder.Build();
             config.ConfigureStackifyLogging();
@@ -35,10 +34,7 @@ static void Main(string[] args)
             StackifyLib.Utils.StackifyAPILogger.OnLogMessage += StackifyAPILogger_OnLogMessage;
             StackifyLib.Utils.StackifyAPILogger.LogEnabled = true;
 
-
-            string filePath = "C:\\Source\\stackify-api-dotnet\\samples\\CoreConsoleApp\\Stackify.json";
-
-            Config.ReadStackifyJSONConfig();
+            //Config.ReadStackifyJSONConfig();
 
             //NLogTest();
             Console.WriteLine($"Stackify Config AppName: {StackifyLib.Config.AppName}");

samples/CoreConsoleApp/Stackify.json

@@ -1,5 +1,5 @@
 {
-  "AppName": "CoreConsoleApp",
-  "Environment": "Dev",
-  "ApiKey": "sampleKey"
+  "AppName": "CoreConsoleApp_stackifyjson",
+  "Environment": "Dev_stackifyjson",
+  "ApiKey": "sampleKey_stackifyjson"
 }

samples/CoreWebApp/Stackify.json

@@ -1,5 +1,5 @@
 {
-  "AppName": "CoreWebApp",
-  "Environment": "Dev",
-  "ApiKey": "sampleKey"
+  "AppName": "CoreWebApp_stackifyjson",
+  "Environment": "Dev_stackifyjson",
+  "ApiKey": "sampleKey_stackifyjson"
 }

samples/CoreWebApp/Startup.cs

@@ -29,19 +29,17 @@ public Startup(IHostingEnvironment env)
             StackifyLib.Utils.StackifyAPILogger.OnLogMessage += StackifyAPILogger_OnLogMessage;
             StackifyLib.Utils.StackifyAPILogger.LogEnabled = true;
 
-            /*var builder = new ConfigurationBuilder()
+            var builder = new ConfigurationBuilder()
                 .SetBasePath(env.ContentRootPath)
-                .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true)
-                .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true)
+                .AddJsonFile("Stackify.json", optional: true, reloadOnChange: true)
+                .AddJsonFile($"Stackify.{env.EnvironmentName}.json", optional: true)
                 .AddEnvironmentVariables();
             Configuration = builder.Build();
             Configuration.ConfigureStackifyLogging();
 
-            StackifyLib.Config.Environment = env.EnvironmentName;*/
+            //StackifyLib.Config.Environment = env.EnvironmentName;
 
-            string filePath = "C:\\Source\\stackify-api-dotnet\\samples\\CoreWebApp\\Stackify.json";
-
-            Config.ReadStackifyJSONConfig();
+            //Config.ReadStackifyJSONConfig();
             Debug.WriteLine(StackifyLib.Config.AppName);
             Debug.WriteLine(StackifyLib.Config.Environment);
             Debug.WriteLine(StackifyLib.Config.ApiKey);