check environment variables before reading stackify.json

Update logic on overriding environment from ASPNETCORE_ENVIRONMENT and DOTNET_ENVIRONMENT environment variables when reading which Stackify.json to be used.

Author: marc

Src/StackifyLib/Config.cs

@@ -221,9 +221,26 @@ public static void ReadStackifyJSONConfig()
         {
             try
             {
+                var ASPEnvironment = System.Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT");
+                var DotnetEnvironment = System.Environment.GetEnvironmentVariable("DOTNET_ENVIRONMENT");
                 string baseDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
-                string jsonPath = Path.Combine(baseDirectory, "Stackify.json");
-                string json;
+                string jsonPath = string.Empty;
+                string json = string.Empty;
+
+                ASPEnvironment = "Production";
+
+                if (!String.IsNullOrEmpty(ASPEnvironment))
+                {
+                    jsonPath = Path.Combine(baseDirectory, $"Stackify.{ASPEnvironment}.json");
+                }
+                else if (!String.IsNullOrEmpty(DotnetEnvironment))
+                {
+                    jsonPath = Path.Combine(baseDirectory, $"Stackify.{DotnetEnvironment}.json");
+                }
+                else
+                {
+                    jsonPath = Path.Combine(baseDirectory, "Stackify.json");
+                }
 
                 if (File.Exists(jsonPath))
                 {
@@ -241,7 +258,20 @@ public static void ReadStackifyJSONConfig()
                 else
                 {
                     string iisBaseDirectory = System.Web.Hosting.HostingEnvironment.ApplicationPhysicalPath;
-                    string iisJsonPath = Path.Combine(iisBaseDirectory, "Stackify.json");
+                    string iisJsonPath = string.Empty;
+
+                    if (!String.IsNullOrEmpty(ASPEnvironment))
+                    {
+                        iisJsonPath = Path.Combine(iisBaseDirectory, $"Stackify.{ASPEnvironment}.json");
+                    }
+                    else if (!String.IsNullOrEmpty(DotnetEnvironment))
+                    {
+                        iisJsonPath = Path.Combine(iisBaseDirectory, $"Stackify.{DotnetEnvironment}.json");
+                    }
+                    else
+                    {
+                        iisJsonPath = Path.Combine(iisBaseDirectory, "Stackify.json");
+                    }
 
                     if (File.Exists(iisJsonPath))
                     {
@@ -295,7 +325,7 @@ public static void ReadStackifyJSONConfig(string filePath)
         public static void SetStackifyObj(JObject obj)
         {
             AppName = TryGetValue(obj, "AppName") ?? AppName;
-            Environment = GetEnvironment(obj);
+            Environment = TryGetValue(obj, "Environment") ?? Environment;
             ApiKey = TryGetValue(obj, "ApiKey") ?? ApiKey;
         }
 
@@ -327,26 +357,5 @@ private static string TryGetValue(JToken jToken, string key)
 
             return r;
         }
-        public static string GetEnvironment(JObject envName = null)
-        {
-            var ASPEnvironment = System.Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT");
-            var DotnetEnvironment = System.Environment.GetEnvironmentVariable("DOTNET_ENVIRONMENT");
-
-            if (!String.IsNullOrEmpty(ASPEnvironment))
-            {
-                return ASPEnvironment;
-            }
-            else if (!String.IsNullOrEmpty(DotnetEnvironment))
-            {
-                return DotnetEnvironment;
-            }
-            else
-            {
-                var environmentName = TryGetValue(envName, "Environment") ?? Environment;
-
-                return environmentName;
-            }
-            
-        }
     }
 }

samples/CoreConsoleApp/Program.cs

@@ -22,8 +22,8 @@ public class Program
         static void Main(string[] args)
         {
             var builder = new ConfigurationBuilder()
-               .SetBasePath(Directory.GetCurrentDirectory())
-               .AddJsonFile("Stackify.json", optional: true, reloadOnChange: true);
+               .SetBasePath(Directory.GetCurrentDirectory());
+               //.AddJsonFile("Stackify.json", optional: true, reloadOnChange: true);
 
             var config = builder.Build();
             config.ConfigureStackifyLogging();

samples/CoreConsoleApp/Stackify.Production.json

@@ -0,0 +1,5 @@
+{
+  "AppName": "CoreConsoleApp_stackifyjson_Prod",
+  "Environment": "Prod_stackifyjson",
+  "ApiKey": "sampleKey_stackifyjson_Prod"
+}

samples/CoreWebApp/Properties/launchSettings.json

@@ -13,15 +13,15 @@
       "launchBrowser": true,
       "launchUrl": "api/values",
       "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
+        "DOTNET_ENVIRONMENT": "Production"
       }
     },
     "CoreWebApp": {
       "commandName": "Project",
       "launchBrowser": true,
       "launchUrl": "http://localhost:5000/api/values",
       "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
+        "DOTNET_ENVIRONMENT": "Production"
       }
     }
   }

samples/CoreWebApp/Stackify.Development.json

@@ -0,0 +1,5 @@
+{
+  "AppName": "CoreWebApp_stackifyjson_dev",
+  "Environment": "Development",
+  "ApiKey": ""
+}

samples/CoreWebApp/Stackify.Production.json

@@ -0,0 +1,5 @@
+{
+  "AppName": "CoreWebApp_stackifyjson_prod",
+  "Environment": "Production",
+  "ApiKey": ""
+}