huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Initialize logging under exclusive lock (#1161)

This commit is contained in:
Pavel Krymets 2018-08-06 12:30:58 -07:00 committed by GitHub
parent 959771e73a
commit 4e7cbb1931
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp
View File

@ -48,11 +48,6 @@ APPLICATION_MANAGER::GetOrCreateApplicationInfo(
// When accessing the m_pApplicationInfoHash, we need to acquire the application manager // When accessing the m_pApplicationInfoHash, we need to acquire the application manager
// lock to avoid races on setting state. // lock to avoid races on setting state.
SRWSharedLock readLock(m_srwLock); SRWSharedLock readLock(m_srwLock);
if (!m_fDebugInitialize)
{
DebugInitializeFromConfig(m_pHttpServer, pApplication);
m_fDebugInitialize = TRUE;
}
if (g_fInShutdown) if (g_fInShutdown)
{ {
@ -70,8 +65,13 @@ APPLICATION_MANAGER::GetOrCreateApplicationInfo(
// Take exclusive lock before creating the application // Take exclusive lock before creating the application
SRWExclusiveLock writeLock(m_srwLock); SRWExclusiveLock writeLock(m_srwLock);
// Check if other thread created the application if (!m_fDebugInitialize)
{
DebugInitializeFromConfig(m_pHttpServer, pApplication);
m_fDebugInitialize = TRUE;
}
// Check if other thread created the application
m_pApplicationInfoHash->FindKey(pszApplicationId, ppApplicationInfo); m_pApplicationInfoHash->FindKey(pszApplicationId, ppApplicationInfo);
if (*ppApplicationInfo != NULL) if (*ppApplicationInfo != NULL)
{ {