[pack]Update check for InStanbyMode. (#5303)

Author: pragnagopa

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

@@ -128,7 +128,7 @@ internal void EnsureInitialized(WebHostSettings settings)
                 // Determine whether we should do normal or standby initialization
                 if (!WebScriptHostManager.InStandbyMode)
                 {
-                    EncureInitializedNonStandbyMode(settings);
+                    EnsureInitializedNonStandbyMode(settings);
                 }
                 else
                 {
@@ -170,7 +170,7 @@ private void EnsureInitializedStandbyMode(WebHostSettings settings)
             }
         }
 
-        private void EncureInitializedNonStandbyMode(WebHostSettings settings)
+        private void EnsureInitializedNonStandbyMode(WebHostSettings settings)
         {
             try
             {

src/WebJobs.Script.WebHost/WebScriptHostManager.cs

@@ -148,7 +148,18 @@ public static bool InStandbyMode
                 {
                     return true;
                 }
-
+                if (ScriptSettingsManager.Instance.GetSetting(EnvironmentSettingNames.AzureWebsitePlaceholderMode) != null)
+                {
+                    // These environment variables are set by DWAS at during specialization.
+                    // Note: All three varaibles might not get set at the same time.
+                    // Each of these gets set during different phases of specialization
+                    if (!(ScriptSettingsManager.Instance.GetSetting(EnvironmentSettingNames.AzureWebsitePlaceholderMode) == "0"
+                        && ScriptSettingsManager.Instance.GetSetting(EnvironmentSettingNames.AzureWebsiteContainerReady) == "1"
+                        && ScriptSettingsManager.Instance.GetSetting(EnvironmentSettingNames.AzureWebsiteConfigurationReady) == "1"))
+                    {
+                        return true;
+                    }
+                }
                 // no longer standby mode
                 _standbyMode = false;
 

test/WebJobs.Script.Tests.Integration/Host/StandbyModeTests.cs

@@ -32,7 +32,7 @@ public StandbyModeTests()
         }
 
         [Fact]
-        public void InStandbyMode_ReturnsExpectedValue()
+        public void InStandbyMode_ReturnsExpectedValue_AzureWebsitePlaceholderMode_Set()
         {
             using (new TestEnvironment())
             {
@@ -44,8 +44,34 @@ public void InStandbyMode_ReturnsExpectedValue()
             {
                 _settingsManager.SetSetting(EnvironmentSettingNames.AzureWebsitePlaceholderMode, "1");
                 Assert.Equal(true, WebScriptHostManager.InStandbyMode);
+            }
+        }
+
+        [Fact]
+        public void InStandbyMode_ReturnsExpectedValue_AzureWebsiteContainerReady_Set()
+        {
+            using (new TestEnvironment())
+            {
+                _settingsManager.SetSetting(EnvironmentSettingNames.AzureWebsitePlaceholderMode, "0");
+                _settingsManager.SetSetting(EnvironmentSettingNames.AzureWebsiteContainerReady, "1");
+                Assert.Equal(true, WebScriptHostManager.InStandbyMode);
+            }
+        }
+
+        [Fact]
+        public void InStandbyMode_ReturnsExpectedValue()
+        {
+            using (new TestEnvironment())
+            {
+                // initially false
+                Assert.Equal(false, WebScriptHostManager.InStandbyMode);
+            }
 
+            using (new TestEnvironment())
+            {
                 _settingsManager.SetSetting(EnvironmentSettingNames.AzureWebsitePlaceholderMode, "0");
+                _settingsManager.SetSetting(EnvironmentSettingNames.AzureWebsiteContainerReady, "1");
+                _settingsManager.SetSetting(EnvironmentSettingNames.AzureWebsiteConfigurationReady, "1");
                 Assert.Equal(false, WebScriptHostManager.InStandbyMode);
 
                 // test only set one way
@@ -93,6 +119,9 @@ public void EnsureInitialized_NonPlaceholderMode()
 
                 var settings = GetWebHostSettings();
                 _settingsManager.SetSetting(EnvironmentSettingNames.AzureWebsitePlaceholderMode, "0");
+                _settingsManager.SetSetting(EnvironmentSettingNames.AzureWebsiteConfigurationReady, "1");
+                _settingsManager.SetSetting(EnvironmentSettingNames.AzureWebsiteContainerReady, "1");
+
                 Assert.False(WebScriptHostManager.InStandbyMode);
                 _webHostResolver.EnsureInitialized(settings);
 
@@ -194,13 +223,17 @@ private class TestEnvironment : IDisposable
             private string _home;
             private string _prevHome;
             private string _prevPlaceholderMode;
+            private string _prevConfigurationReady;
+            private string _prevContainerReady;
             private string _prevInstanceId;
 
             public TestEnvironment()
             {
                 _settingsManager = ScriptSettingsManager.Instance;
                 _prevHome = _settingsManager.GetSetting(EnvironmentSettingNames.AzureWebsiteHomePath);
                 _prevPlaceholderMode = _settingsManager.GetSetting(EnvironmentSettingNames.AzureWebsitePlaceholderMode);
+                _prevConfigurationReady = _settingsManager.GetSetting(EnvironmentSettingNames.AzureWebsiteConfigurationReady);
+                _prevContainerReady = _settingsManager.GetSetting(EnvironmentSettingNames.AzureWebsiteContainerReady);
                 _prevInstanceId = _settingsManager.GetSetting(EnvironmentSettingNames.AzureWebsiteInstanceId);
 
                 _home = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
@@ -217,6 +250,9 @@ public void Dispose()
                 _settingsManager.SetSetting(EnvironmentSettingNames.AzureWebsiteHomePath, _prevHome);
                 _settingsManager.SetSetting(EnvironmentSettingNames.AzureWebsiteInstanceId, _prevInstanceId);
                 _settingsManager.SetSetting(EnvironmentSettingNames.AzureWebsitePlaceholderMode, _prevPlaceholderMode);
+                _settingsManager.SetSetting(EnvironmentSettingNames.AzureWebsiteConfigurationReady, _prevConfigurationReady);
+                _settingsManager.SetSetting(EnvironmentSettingNames.AzureWebsiteContainerReady, _prevContainerReady);
+
                 try
                 {
                     Directory.Delete(_home, recursive: true);