Tweaking Local mode HostId generation

Author: mathewc

src/WebJobs.Script.Host/Program.cs

@@ -21,12 +21,12 @@ public static void Main(string[] args)
                 rootPath = (string)args[0];
             }
 
-            ScriptHostConfiguration config = new ScriptHostConfiguration()
+            var config = new ScriptHostConfiguration()
             {
                 RootScriptPath = rootPath
             };
 
-            ScriptHostManager scriptHostManager = new ScriptHostManager(config);
+            var scriptHostManager = new ScriptHostManager(config);
             scriptHostManager.RunAndBlock();
         }
     }

src/WebJobs.Script.WebHost/App_Start/WebHostSettings.cs

@@ -33,23 +33,24 @@ public class WebHostSettings
 
         internal static WebHostSettings CreateDefault(ScriptSettingsManager settingsManager)
         {
-            WebHostSettings settings = new WebHostSettings();
-
-            string home = settingsManager.GetSetting(EnvironmentSettingNames.AzureWebsiteHomePath);
-            bool isLocal = string.IsNullOrEmpty(home);
-            if (isLocal)
+            WebHostSettings settings = new WebHostSettings
             {
-                settings.ScriptPath = settingsManager.GetSetting(EnvironmentSettingNames.AzureWebJobsScriptRoot);
-                settings.LogPath = Path.Combine(Path.GetTempPath(), @"Functions");
-                settings.SecretsPath = System.Web.HttpContext.Current.Server.MapPath("~/App_Data/Secrets");
-            }
-            else
+                IsSelfHost = !settingsManager.IsAzureEnvironment
+            };
+
+            if (settingsManager.IsAzureEnvironment)
             {
-                // we're running in Azure
+                string home = settingsManager.GetSetting(EnvironmentSettingNames.AzureWebsiteHomePath);
                 settings.ScriptPath = Path.Combine(home, @"site\wwwroot");
                 settings.LogPath = Path.Combine(home, @"LogFiles\Application\Functions");
                 settings.SecretsPath = Path.Combine(home, @"data\Functions\secrets");
             }
+            else
+            {
+                settings.ScriptPath = settingsManager.GetSetting(EnvironmentSettingNames.AzureWebJobsScriptRoot);
+                settings.LogPath = Path.Combine(Path.GetTempPath(), @"Functions");
+                settings.SecretsPath = System.Web.HttpContext.Current.Server.MapPath("~/App_Data/Secrets");
+            }
 
             if (string.IsNullOrEmpty(settings.ScriptPath))
             {

src/WebJobs.Script/Config/ScriptSettingsManager.cs

@@ -22,7 +22,7 @@ public static ScriptSettingsManager Instance
             set { _instance = value; }
         }
 
-        public bool IsAzureEnvironment => !string.IsNullOrEmpty(GetSetting(EnvironmentSettingNames.AzureWebsiteInstanceId));
+        public virtual bool IsAzureEnvironment => !string.IsNullOrEmpty(GetSetting(EnvironmentSettingNames.AzureWebsiteInstanceId));
 
         public bool IsRemoteDebuggingEnabled => !string.IsNullOrEmpty(GetSetting(EnvironmentSettingNames.RemoteDebuggingPort));