stop before dispose a scriptHostManager

Azure · Nov 8, 2017 · ae05f55 · ae05f55
1 parent a2c2693
commit ae05f55
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/src/WebJobs.Script.WebHost/App_Start/WebHostResolver.cs b/src/WebJobs.Script.WebHost/App_Start/WebHostResolver.cs
@@ -136,7 +136,11 @@ internal void EnsureInitialized(WebHostSettings settings)
                         TimeZoneInfo.ClearCachedData();
                     }
 
-                    _standbyHostManager?.Dispose();
+                    if (_standbyHostManager != null)
+                    {
+                        _standbyHostManager.Stop();
+                        _standbyHostManager.Dispose();
+                    }
                     _standbyReceiverManager?.Dispose();
                     _standbyScriptHostConfig = null;
                     _standbyHostManager = null;

diff --git a/src/WebJobs.Script.WebHost/Security/FileSystemSecretsRepository.cs b/src/WebJobs.Script.WebHost/Security/FileSystemSecretsRepository.cs
@@ -113,6 +113,10 @@ public async Task PurgeOldSecretsAsync(IList<string> currentFunctions, TraceWrit
                     {
                         try
                         {
+                            // destructive operation, thus log
+                            string removeSecretsMessage = $"Deleting secret file {secretFile.FullName}";
+                            traceWriter.Verbose(removeSecretsMessage);
+                            logger?.LogDebug(removeSecretsMessage);
                             await FileUtility.DeleteIfExistsAsync(secretFile.FullName);
                         }
                         catch

diff --git a/src/WebJobs.Script/Host/ScriptHost.cs b/src/WebJobs.Script/Host/ScriptHost.cs
@@ -775,6 +775,10 @@ private void PurgeOldLogDirectories()
                         // so delete it
                         try
                         {
+                            // destructive operation, thus log
+                            string removeLogMessage = $"Deleting log directory '{logDir.FullName}'";
+                            TraceWriter.Verbose(removeLogMessage);
+                            _startupLogger?.LogDebug(removeLogMessage);
                             logDir.Delete(recursive: true);
                         }
                         catch

diff --git a/test/WebJobs.Script.Tests.Integration/Host/StandbyManagerTests.cs b/test/WebJobs.Script.Tests.Integration/Host/StandbyManagerTests.cs
@@ -129,7 +129,7 @@ public async Task StandbyMode_EndToEnd()
                 // verify logs
                 string[] logLines = traceWriter.Traces.Select(p => p.Message).ToArray();
                 Assert.Equal(2, logLines.Count(p => p.Contains("Host is in standby mode")));
-                Assert.Equal(1, logLines.Count(p => p.Contains("Stopping Host")));
+                Assert.Equal(2, logLines.Count(p => p.Contains("Stopping Host")));
                 Assert.Equal(2, logLines.Count(p => p.Contains("Executed 'Functions.WarmUp' (Succeeded")));
                 Assert.Equal(1, logLines.Count(p => p.Contains("Starting host specialization")));