Generally working, need to fix small shutdown issue

jkotalik · jkotalik · commit aabcdd670cd8 · 2021-02-07T09:27:09.000-08:00
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.cpp b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.cpp
@@ -11,6 +11,7 @@ HRESULT AppOfflineApplication::CreateHandler(IHttpContext* pHttpContext, IREQUES
 {
     try
     {
+        LOG_INFO(L"AppOfflineApp CreateHandler");
         auto handler = std::make_unique<AppOfflineHandler>(*pHttpContext, m_strAppOfflineContent);
         *pRequestHandler = handler.release();
     }
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp
@@ -182,6 +182,13 @@ void HandlerResolver::ResetHostingModel()
     m_loadedApplicationId.resize(0);
 }
 
+APP_HOSTING_MODEL HandlerResolver::GetHostingModel()
+{
+    SRWExclusiveLock lock(m_requestHandlerLoadLock);
+
+    return m_loadedApplicationHostingModel;
+}
+
 HRESULT
 HandlerResolver::FindNativeAssemblyFromGlobalLocation(
     const ShimOptions& pConfiguration,
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/HandlerResolver.h b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/HandlerResolver.h
@@ -18,6 +18,7 @@ class HandlerResolver
     HandlerResolver(HMODULE hModule, const IHttpServer &pServer);
     HRESULT GetApplicationFactory(const IHttpApplication &pApplication, std::filesystem::path shadowCopyPath, std::unique_ptr<ApplicationFactory>& pApplicationFactory, const ShimOptions& options, ErrorContext& errorContext);
     void ResetHostingModel();
+    APP_HOSTING_MODEL GetHostingModel();
 
 private:
     HRESULT LoadRequestHandlerAssembly(const IHttpApplication &pApplication, std::filesystem::path shadowCopyPath, const ShimOptions& pConfiguration, std::unique_ptr<ApplicationFactory>& pApplicationFactory, ErrorContext& errorContext);
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp
@@ -20,6 +20,7 @@
 #include "file_utility.h"
 
 extern HINSTANCE           g_hServerModule;
+extern BOOL         g_fInShutdown;
 
 HRESULT
 APPLICATION_INFO::CreateHandler(
@@ -32,10 +33,11 @@ APPLICATION_INFO::CreateHandler(
     {
         SRWSharedLock lock(m_applicationLock);
 
-        RETURN_IF_FAILED(hr = TryCreateHandler(pHttpContext, pHandler));
+        hr = TryCreateHandler(pHttpContext, pHandler);
 
         if (hr == S_OK)
         {
+            LOG_INFO(L"Created handler from application");
             return S_OK;
         }
     }
@@ -44,7 +46,7 @@ APPLICATION_INFO::CreateHandler(
         SRWExclusiveLock lock(m_applicationLock);
 
         // check if other thread created application
-        RETURN_IF_FAILED(hr = TryCreateHandler(pHttpContext, pHandler));
+        hr = TryCreateHandler(pHttpContext, pHandler);
 
         // In some cases (adding and removing app_offline quickly) application might start and stop immediately
         // so retry until we get valid handler or error
@@ -62,6 +64,7 @@ APPLICATION_INFO::CreateHandler(
                 m_pApplicationFactory = nullptr;
             }
 
+            LOG_INFO(L"Calling create application");
             RETURN_IF_FAILED(CreateApplication(pHttpContext));
 
             RETURN_IF_FAILED(hr = TryCreateHandler(pHttpContext, pHandler));
@@ -75,7 +78,7 @@ HRESULT
 APPLICATION_INFO::CreateApplication(IHttpContext& pHttpContext)
 {
     auto& pHttpApplication = *pHttpContext.GetApplication();
-    if (AppOfflineApplication::ShouldBeStarted(pHttpApplication))
+    if (AppOfflineApplication::ShouldBeStarted(pHttpApplication) || g_fInShutdown)
     {
         LOG_INFO(L"Detected app_offline file, creating polling application");
         m_pApplication = make_application<AppOfflineApplication>(pHttpApplication);
@@ -93,7 +96,6 @@ APPLICATION_INFO::CreateApplication(IHttpContext& pHttpContext)
             errorContext.statusCode = 500i16;
             errorContext.subStatusCode = 0i16;
 
-
             const auto hr = TryCreateApplication(pHttpContext, options, errorContext);
 
             if (FAILED_LOG(hr))
@@ -135,10 +137,11 @@ APPLICATION_INFO::CreateApplication(IHttpContext& pHttpContext)
         }
         catch (...)
         {
+            OBSERVE_CAUGHT_EXCEPTION();
             EventLog::Error(
                 ASPNETCORE_CONFIGURATION_LOAD_ERROR,
                 ASPNETCORE_CONFIGURATION_LOAD_ERROR_MSG,
-                L"");
+                L"Create Application");
         }
 
         m_pApplication = make_application<ServerErrorApplication>(
@@ -202,15 +205,16 @@ APPLICATION_INFO::TryCreateApplication(IHttpContext& pHttpContext, const ShimOpt
                 {
                     // TODO maybe able to read last directory in directory iteration?
                     std::string::size_type sz;
-                    int i_dec = std::stoi(entry.path(), &sz);
+                    int i_dec = std::stoi(entry.path().filename().string(), &sz);
                     if (i_dec > directoryName)
                     {
                         directoryName = i_dec;
                         directoryNameStr = std::string(entry.path().string());
                     }
                 }
-                catch (const std::exception&)
+                catch (...)
                 {
+                    OBSERVE_CAUGHT_EXCEPTION();
                     // Ignore any folders that can't be converted to an int.
                 }
             }
@@ -220,7 +224,7 @@ APPLICATION_INFO::TryCreateApplication(IHttpContext& pHttpContext, const ShimOpt
         shadowCopyPath = shadowCopyPath / std::filesystem::path(directoryNameStr);
         RETURN_IF_FAILED(Environment::CopyToDirectory(shadowCopyPath, physicalPath, options.QueryCleanShadowCopyDirectory()));
     }
-   
+
     RETURN_IF_FAILED(m_handlerResolver.GetApplicationFactory(*pHttpContext.GetApplication(), shadowCopyPath, m_pApplicationFactory, options, error));
     LOG_INFO(L"Creating handler application");
 
@@ -245,6 +249,7 @@ APPLICATION_INFO::TryCreateHandler(
         IREQUEST_HANDLER * newHandler;
         const auto result = m_pApplication->TryCreateHandler(&pHttpContext, &newHandler);
         RETURN_IF_FAILED(result);
+        LOG_INFO(L"Created handler");
 
         if (result == S_OK)
         {
@@ -253,6 +258,10 @@ APPLICATION_INFO::TryCreateHandler(
             return S_OK;
         }
     }
+    else
+    {
+        LOG_INFO(L"No Handler, no app");
+    }
     return S_FALSE;
 }
 
@@ -265,6 +274,7 @@ APPLICATION_INFO::ShutDownApplication(bool fServerInitiated)
     {
         LOG_INFOF(L"Stopping application '%ls'", QueryApplicationInfoKey().c_str());
         m_pApplication->Stop(fServerInitiated);
+        LOG_INFO(L"Setting app to null");
         m_pApplication = nullptr;
         m_pApplicationFactory = nullptr;
     }
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp
@@ -116,6 +116,11 @@ APPLICATION_MANAGER::RecycleApplicationFromManager(
                 }
             }
 
+            if (m_handlerResolver.GetHostingModel() == APP_HOSTING_MODEL::HOSTING_IN_PROCESS)
+            {
+                g_fInShutdown = true;
+            }
+
             // All applications were unloaded reset handler resolver validation logic
             if (m_pApplicationInfoHash.empty())
             {
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/Environment.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/Environment.cpp
@@ -168,6 +168,29 @@ HRESULT Environment::CopyToDirectory(std::filesystem::path destination, std::wst
 
     // Always does a copy on startup, as if there are not files to update
     // this copy should be fast.
-    std::filesystem::copy(source, destination, std::filesystem::copy_options::recursive | std::filesystem::copy_options::update_existing);
+    //"C:\inetpub\wwwroot\", "C:\inetpub\ShadowCopyDirectory\1"'
+    Environment::CopyDirTo(source, destination.wstring());
     return S_OK;
 }
+
+bool Environment::CopyDirTo( const std::wstring& source_folder, const std::wstring& target_folder )
+{
+    std::wstring new_sf = source_folder + L"\\*";
+    WCHAR sf[MAX_PATH+1];
+    WCHAR tf[MAX_PATH+1];
+
+    wcscpy_s(sf, MAX_PATH, new_sf.c_str());
+    wcscpy_s(tf, MAX_PATH, target_folder.c_str());
+
+    sf[lstrlenW(sf)+1] = 0;
+    tf[lstrlenW(tf)+1] = 0;
+
+    SHFILEOPSTRUCTW s = { 0 };
+    s.wFunc = FO_COPY;
+    s.pTo = tf;
+    s.pFrom = sf;
+    s.fFlags = FOF_SILENT | FOF_NOCONFIRMMKDIR | FOF_NOCONFIRMATION | FOF_NOERRORUI | FOF_NO_UI;
+    int res = SHFileOperationW( &s );
+
+    return res == 0;
+}
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/Environment.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/Environment.h
@@ -24,5 +24,7 @@ class Environment
     bool IsRunning64BitProcess();
     static
     HRESULT CopyToDirectory(std::filesystem::path destination, std::wstring source, bool cleanDest);
+    static
+    bool CopyDirTo( const std::wstring& source_folder, const std::wstring& target_folder );
 };
 
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.cpp
@@ -11,6 +11,8 @@
 HRESULT PollingAppOfflineApplication::TryCreateHandler(_In_ IHttpContext* pHttpContext, _Outptr_result_maybenull_ IREQUEST_HANDLER** pRequestHandler)
 {
     CheckAppOffline();
+    LOG_INFO(L"Trying to create handler");
+
     return LOG_IF_FAILED(APPLICATION::TryCreateHandler(pHttpContext, pRequestHandler));
 }
 
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/ServerErrorApplication.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/ServerErrorApplication.h
@@ -24,6 +24,7 @@ class ServerErrorApplication : public PollingAppOfflineApplication
 
     HRESULT CreateHandler(IHttpContext *pHttpContext, IREQUEST_HANDLER ** pRequestHandler) override
     {
+        LOG_INFO(L"Server error");
         *pRequestHandler = std::make_unique<ServerErrorHandler>(*pHttpContext, m_statusCode, m_subStatusCode, m_statusText, m_HR, m_disableStartupPage, m_responseContent).release();
 
         return S_OK;
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.cpp b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.cpp
@@ -30,6 +30,7 @@ InProcessApplicationBase::StopInternal(bool fServerInitiated)
         // We don't actually handle any shutdown logic here.
         // Instead, we notify IIS that the process needs to be recycled, which will call
         // ApplicationManager->Shutdown(). This will call shutdown on the application.
+        LOG_INFO(L"Recycling process NOW");
         m_pHttpServer.RecycleProcess(L"AspNetCore InProcess Recycle Process on Demand");
     }
     else
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/ShuttingDownApplication.h b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/ShuttingDownApplication.h
@@ -40,6 +40,7 @@ class ShuttingDownApplication : public InProcessApplicationBase
 
     HRESULT CreateHandler(IHttpContext * pHttpContext, IREQUEST_HANDLER ** pRequestHandler) override
     {
+        LOG_INFO(L"ShuttingDown CreateHandler");
         *pRequestHandler = new ShuttingDownHandler(pHttpContext);
         return S_OK;
     }
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h
@@ -33,6 +33,7 @@ class StartupExceptionApplication : public InProcessApplicationBase
 
     HRESULT CreateHandler(IHttpContext* pHttpContext, IREQUEST_HANDLER** pRequestHandler)
     {
+        LOG_INFO(L"StartupException CreateHandler");
         *pRequestHandler = new ServerErrorHandler(*pHttpContext, m_statusCode, m_subStatusCode, m_statusText, m_HR, m_disableLogs, m_error);
 
         return S_OK;
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp
@@ -50,6 +50,7 @@ IN_PROCESS_APPLICATION::~IN_PROCESS_APPLICATION()
 VOID
 IN_PROCESS_APPLICATION::StopInternal(bool fServerInitiated)
 {
+    AppOfflineTrackingApplication::StopInternal(fServerInitiated);
     StopClr();
     InProcessApplicationBase::StopInternal(fServerInitiated);
 }
@@ -582,7 +583,7 @@ IN_PROCESS_APPLICATION::CreateHandler(
     try
     {
         SRWSharedLock dataLock(m_dataLock);
-
+        LOG_INFO(L"Creating handler inprocessapplication");
         DBG_ASSERT(!m_fStopCalled);
         m_requestCount++;
 
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.cpp b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.cpp
@@ -25,13 +25,15 @@ HRESULT AppOfflineTrackingApplication::StartMonitoringAppOffline()
 
 void AppOfflineTrackingApplication::StopInternal(bool fServerInitiated)
 {
-    APPLICATION::StopInternal(fServerInitiated);
+    LOG_INFO(L"Stop Internal AppOfflineTracking");
 
     if (m_fileWatcher)
     {
         m_fileWatcher->StopMonitor();
         m_fileWatcher = nullptr;
     }
+
+    APPLICATION::StopInternal(fServerInitiated);
 }
 
 HRESULT AppOfflineTrackingApplication::StartMonitoringAppOflineImpl()
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp
@@ -49,6 +49,7 @@ void FILE_WATCHER::WaitForMonitor(DWORD dwRetryCounter)
             {
                 // fail to get thread status
                 // call terminitethread
+                LOG_INFO(L"BAD");
                 TerminateThread(m_hChangeNotificationThread, 1);
                 m_fThreadExit = TRUE;
             }
@@ -57,6 +58,7 @@ void FILE_WATCHER::WaitForMonitor(DWORD dwRetryCounter)
 
         if (!m_fThreadExit)
         {
+            LOG_INFO(L"BAD");
             TerminateThread(m_hChangeNotificationThread, 1);
         }
     }
@@ -337,9 +339,7 @@ FILE_WATCHER::TimerCallback(
 
 DWORD WINAPI FILE_WATCHER::CopyAndShutdown(LPVOID arg)
 {
-    EventLog::Error(
-        1,
-        L"Callback");
+    LOG_INFO(L"Start copy and shutdown");
     auto directoryName = 0;
     // wrong path.
     auto watcher = (FILE_WATCHER*)arg;
@@ -365,8 +365,10 @@ DWORD WINAPI FILE_WATCHER::CopyAndShutdown(LPVOID arg)
 
     watcher->_pApplication->ReferenceApplication();
     SetEvent(watcher->m_pShutdownEvent);
-   
+
     QueueUserWorkItem(RunNotificationCallback, watcher->_pApplication.get(), WT_EXECUTEDEFAULT);
+
+    LOG_INFO(L"End copy and shutdown");
     return 0;
 }
 
@@ -423,6 +425,8 @@ FILE_WATCHER::StopMonitor()
         return;
     }
 
+    LOG_INFO(L"Stop monitor");
+
     InterlockedExchange(&_lStopMonitorCalled, 1);
     // signal the file watch thread to exit
     PostQueuedCompletionStatus(m_hCompletionPort, 0, FILE_WATCHER_SHUTDOWN_KEY, NULL);
@@ -435,4 +439,6 @@ FILE_WATCHER::StopMonitor()
 
     // Release application reference
     _pApplication.reset(nullptr);
+
+    LOG_INFO(L"End stop monitor");
 }
diff --git a/src/Servers/IIS/IIS/benchmarks/IIS.Performance/Properties/launchSettings.json b/src/Servers/IIS/IIS/benchmarks/IIS.Performance/Properties/launchSettings.json
@@ -0,0 +1,40 @@
+{
+  "iisSettings": {
+    "windowsAuthentication": true,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:5762/",
+      "sslPort": 0
+    }
+  },
+  "profiles": {
+    "ANCM IIS Express": {
+      "commandName": "Executable",
+      "executablePath": "$(IISExpressPath)",
+      "commandLineArgs": "$(IISExpressArguments)",
+      "environmentVariables": {
+        "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)",
+        "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)",
+        "ASPNETCORE_MODULE_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)",
+        "LAUNCHER_ARGS": "$(TargetPath)",
+        "ASPNETCORE_ENVIRONMENT": "Development",
+        "LAUNCHER_PATH": "$(DotNetPath)",
+        "ASPNETCORE_MODULE_DEBUG": "console"
+      }
+    },
+    "ANCM IIS": {
+      "commandName": "Executable",
+      "executablePath": "$(IISPath)",
+      "commandLineArgs": "$(IISArguments)",
+      "environmentVariables": {
+        "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)",
+        "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)",
+        "ASPNETCORE_MODULE_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)",
+        "LAUNCHER_ARGS": "$(TargetPath)",
+        "ASPNETCORE_ENVIRONMENT": "Development",
+        "LAUNCHER_PATH": "$(DotNetPath)",
+        "ASPNETCORE_MODULE_DEBUG": "console"
+      }
+    }
+  }
+}
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/LoggingTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/LoggingTests.cs
@@ -137,7 +137,7 @@ public async Task StartupMessagesAreLoggedIntoDefaultDebugLogFileWhenEnabledWith
         }
 
         [ConditionalTheory]
-        [MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H1, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
+        //[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H1, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
         [RequiresIIS(IISCapability.PoolEnvironmentVariables)]
         [MemberData(nameof(InprocessTestVariants))]
         public async Task StartupMessagesLogFileSwitchedWhenLogFilePresentInWebConfig(TestVariant variant)

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ HRESULT AppOfflineApplication::CreateHandler(IHttpContext* pHttpContext, IREQUES`
`11`	`11`	`{`
`12`	`12`	`try`
`13`	`13`	`{`
	`14`	`+ LOG_INFO(L"AppOfflineApp CreateHandler");`
`14`	`15`	`auto handler = std::make_unique<AppOfflineHandler>(*pHttpContext, m_strAppOfflineContent);`
`15`	`16`	`*pRequestHandler = handler.release();`
`16`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`	`#include "file_utility.h"`
`21`	`21`
`22`	`22`	`extern HINSTANCE g_hServerModule;`
	`23`	`+extern BOOL g_fInShutdown;`
`23`	`24`
`24`	`25`	`HRESULT`
`25`	`26`	`APPLICATION_INFO::CreateHandler(`
`@@ -32,10 +33,11 @@ APPLICATION_INFO::CreateHandler(`
`32`	`33`	`{`
`33`	`34`	`SRWSharedLock lock(m_applicationLock);`
`34`	`35`
`35`		`- RETURN_IF_FAILED(hr = TryCreateHandler(pHttpContext, pHandler));`
	`36`	`+ hr = TryCreateHandler(pHttpContext, pHandler);`
`36`	`37`
`37`	`38`	`if (hr == S_OK)`
`38`	`39`	`{`
	`40`	`+ LOG_INFO(L"Created handler from application");`
`39`	`41`	`return S_OK;`
`40`	`42`	`}`
`41`	`43`	`}`
`@@ -44,7 +46,7 @@ APPLICATION_INFO::CreateHandler(`
`44`	`46`	`SRWExclusiveLock lock(m_applicationLock);`
`45`	`47`
`46`	`48`	`// check if other thread created application`
`47`		`- RETURN_IF_FAILED(hr = TryCreateHandler(pHttpContext, pHandler));`
	`49`	`+ hr = TryCreateHandler(pHttpContext, pHandler);`
`48`	`50`
`49`	`51`	`// In some cases (adding and removing app_offline quickly) application might start and stop immediately`
`50`	`52`	`// so retry until we get valid handler or error`
`@@ -62,6 +64,7 @@ APPLICATION_INFO::CreateHandler(`
`62`	`64`	`m_pApplicationFactory = nullptr;`
`63`	`65`	`}`
`64`	`66`
	`67`	`+ LOG_INFO(L"Calling create application");`
`65`	`68`	`RETURN_IF_FAILED(CreateApplication(pHttpContext));`
`66`	`69`
`67`	`70`	`RETURN_IF_FAILED(hr = TryCreateHandler(pHttpContext, pHandler));`
`@@ -75,7 +78,7 @@ HRESULT`
`75`	`78`	`APPLICATION_INFO::CreateApplication(IHttpContext& pHttpContext)`
`76`	`79`	`{`
`77`	`80`	`auto& pHttpApplication = *pHttpContext.GetApplication();`
`78`		`- if (AppOfflineApplication::ShouldBeStarted(pHttpApplication))`
	`81`	`+ if (AppOfflineApplication::ShouldBeStarted(pHttpApplication) \|\| g_fInShutdown)`
`79`	`82`	`{`
`80`	`83`	`LOG_INFO(L"Detected app_offline file, creating polling application");`
`81`	`84`	`m_pApplication = make_application<AppOfflineApplication>(pHttpApplication);`
`@@ -93,7 +96,6 @@ APPLICATION_INFO::CreateApplication(IHttpContext& pHttpContext)`
`93`	`96`	`errorContext.statusCode = 500i16;`
`94`	`97`	`errorContext.subStatusCode = 0i16;`
`95`	`98`
`96`		`-`
`97`	`99`	`const auto hr = TryCreateApplication(pHttpContext, options, errorContext);`
`98`	`100`
`99`	`101`	`if (FAILED_LOG(hr))`
`@@ -135,10 +137,11 @@ APPLICATION_INFO::CreateApplication(IHttpContext& pHttpContext)`
`135`	`137`	`}`
`136`	`138`	`catch (...)`
`137`	`139`	`{`
	`140`	`+ OBSERVE_CAUGHT_EXCEPTION();`
`138`	`141`	`EventLog::Error(`
`139`	`142`	`ASPNETCORE_CONFIGURATION_LOAD_ERROR,`
`140`	`143`	`ASPNETCORE_CONFIGURATION_LOAD_ERROR_MSG,`
`141`		`- L"");`
	`144`	`+ L"Create Application");`
`142`	`145`	`}`
`143`	`146`
`144`	`147`	`m_pApplication = make_application<ServerErrorApplication>(`
`@@ -202,15 +205,16 @@ APPLICATION_INFO::TryCreateApplication(IHttpContext& pHttpContext, const ShimOpt`
`202`	`205`	`{`
`203`	`206`	`// TODO maybe able to read last directory in directory iteration?`
`204`	`207`	`std::string::size_type sz;`
`205`		`- int i_dec = std::stoi(entry.path(), &sz);`
	`208`	`+ int i_dec = std::stoi(entry.path().filename().string(), &sz);`
`206`	`209`	`if (i_dec > directoryName)`
`207`	`210`	`{`
`208`	`211`	`directoryName = i_dec;`
`209`	`212`	`directoryNameStr = std::string(entry.path().string());`
`210`	`213`	`}`
`211`	`214`	`}`
`212`		`- catch (const std::exception&)`
	`215`	`+ catch (...)`
`213`	`216`	`{`
	`217`	`+ OBSERVE_CAUGHT_EXCEPTION();`
`214`	`218`	`// Ignore any folders that can't be converted to an int.`
`215`	`219`	`}`
`216`	`220`	`}`
`@@ -220,7 +224,7 @@ APPLICATION_INFO::TryCreateApplication(IHttpContext& pHttpContext, const ShimOpt`
`220`	`224`	`shadowCopyPath = shadowCopyPath / std::filesystem::path(directoryNameStr);`
`221`	`225`	`RETURN_IF_FAILED(Environment::CopyToDirectory(shadowCopyPath, physicalPath, options.QueryCleanShadowCopyDirectory()));`
`222`	`226`	`}`
`223`		`-`
	`227`	`+`
`224`	`228`	`RETURN_IF_FAILED(m_handlerResolver.GetApplicationFactory(*pHttpContext.GetApplication(), shadowCopyPath, m_pApplicationFactory, options, error));`
`225`	`229`	`LOG_INFO(L"Creating handler application");`
`226`	`230`
`@@ -245,6 +249,7 @@ APPLICATION_INFO::TryCreateHandler(`
`245`	`249`	`IREQUEST_HANDLER * newHandler;`
`246`	`250`	`const auto result = m_pApplication->TryCreateHandler(&pHttpContext, &newHandler);`
`247`	`251`	`RETURN_IF_FAILED(result);`
	`252`	`+ LOG_INFO(L"Created handler");`
`248`	`253`
`249`	`254`	`if (result == S_OK)`
`250`	`255`	`{`
`@@ -253,6 +258,10 @@ APPLICATION_INFO::TryCreateHandler(`
`253`	`258`	`return S_OK;`
`254`	`259`	`}`
`255`	`260`	`}`
	`261`	`+ else`
	`262`	`+ {`
	`263`	`+ LOG_INFO(L"No Handler, no app");`
	`264`	`+ }`
`256`	`265`	`return S_FALSE;`
`257`	`266`	`}`
`258`	`267`
`@@ -265,6 +274,7 @@ APPLICATION_INFO::ShutDownApplication(bool fServerInitiated)`
`265`	`274`	`{`
`266`	`275`	`LOG_INFOF(L"Stopping application '%ls'", QueryApplicationInfoKey().c_str());`
`267`	`276`	`m_pApplication->Stop(fServerInitiated);`
	`277`	`+ LOG_INFO(L"Setting app to null");`
`268`	`278`	`m_pApplication = nullptr;`
`269`	`279`	`m_pApplicationFactory = nullptr;`
`270`	`280`	`}`
Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,11 @@ APPLICATION_MANAGER::RecycleApplicationFromManager(`
`116`	`116`	`}`
`117`	`117`	`}`
`118`	`118`
	`119`	`+ if (m_handlerResolver.GetHostingModel() == APP_HOSTING_MODEL::HOSTING_IN_PROCESS)`
	`120`	`+ {`
	`121`	`+ g_fInShutdown = true;`
	`122`	`+ }`
	`123`	`+`
`119`	`124`	`// All applications were unloaded reset handler resolver validation logic`
`120`	`125`	`if (m_pApplicationInfoHash.empty())`
`121`	`126`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@`
`11`	`11`	`HRESULT PollingAppOfflineApplication::TryCreateHandler(_In_ IHttpContext* pHttpContext, _Outptr_result_maybenull_ IREQUEST_HANDLER** pRequestHandler)`
`12`	`12`	`{`
`13`	`13`	`CheckAppOffline();`
	`14`	`+ LOG_INFO(L"Trying to create handler");`
	`15`	`+`
`14`	`16`	`return LOG_IF_FAILED(APPLICATION::TryCreateHandler(pHttpContext, pRequestHandler));`
`15`	`17`	`}`
`16`	`18`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ class ServerErrorApplication : public PollingAppOfflineApplication`
`24`	`24`
`25`	`25`	`HRESULT CreateHandler(IHttpContext pHttpContext, IREQUEST_HANDLER * pRequestHandler) override`
`26`	`26`	`{`
	`27`	`+ LOG_INFO(L"Server error");`
`27`	`28`	`pRequestHandler = std::make_unique<ServerErrorHandler>(pHttpContext, m_statusCode, m_subStatusCode, m_statusText, m_HR, m_disableStartupPage, m_responseContent).release();`
`28`	`29`
`29`	`30`	`return S_OK;`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ InProcessApplicationBase::StopInternal(bool fServerInitiated)`
`30`	`30`	`// We don't actually handle any shutdown logic here.`
`31`	`31`	`// Instead, we notify IIS that the process needs to be recycled, which will call`
`32`	`32`	`// ApplicationManager->Shutdown(). This will call shutdown on the application.`
	`33`	`+ LOG_INFO(L"Recycling process NOW");`
`33`	`34`	`m_pHttpServer.RecycleProcess(L"AspNetCore InProcess Recycle Process on Demand");`
`34`	`35`	`}`
`35`	`36`	`else`