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

Set correct event providers for ANCM V2 (#1009)

This commit is contained in:
Justin Kotalik 2018-07-02 18:21:22 -07:00 committed by GitHub
parent 9b7ee92028
commit 3efc1eede4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/AspNetCoreModuleV2/AspNetCore/Inc/aspnetcore_shim_config.h
View File

@ -38,12 +38,6 @@ public:
return &m_struApplicationPhysicalPath; return &m_struApplicationPhysicalPath;
} }
STRU*
QueryApplicationPath()
{
return &m_struApplication;
}
STRU* STRU*
QueryConfigPath() QueryConfigPath()
{ {
@ -83,7 +77,6 @@ private:
STRU m_struArguments; STRU m_struArguments;
STRU m_struProcessPath; STRU m_struProcessPath;
STRU m_struApplication;
STRU m_struApplicationPhysicalPath; STRU m_struApplicationPhysicalPath;
STRU m_struConfigPath; STRU m_struConfigPath;
APP_HOSTING_MODEL m_hostingModel; APP_HOSTING_MODEL m_hostingModel;

2
src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp
View File

@ -153,7 +153,7 @@ APPLICATION_INFO::UpdateAppOfflineFileHandle()
STACK_STRU(strEventMsg, 256); STACK_STRU(strEventMsg, 256);
if (SUCCEEDED(strEventMsg.SafeSnwprintf( if (SUCCEEDED(strEventMsg.SafeSnwprintf(
ASPNETCORE_EVENT_RECYCLE_APPOFFLINE_MSG, ASPNETCORE_EVENT_RECYCLE_APPOFFLINE_MSG,
m_pConfiguration->QueryApplicationPath()->QueryStr()))) m_pConfiguration->QueryApplicationPhysicalPath()->QueryStr())))
{ {
UTILITY::LogEvent(g_hEventLog, UTILITY::LogEvent(g_hEventLog,
EVENTLOG_INFORMATION_TYPE, EVENTLOG_INFORMATION_TYPE,

4
src/AspNetCoreModuleV2/CommonLib/resources.h
View File

@ -8,8 +8,8 @@
#define IDS_INVALID_PROPERTY 1000 #define IDS_INVALID_PROPERTY 1000
#define IDS_SERVER_ERROR 1001 #define IDS_SERVER_ERROR 1001
#define ASPNETCORE_EVENT_PROVIDER L"IIS AspNetCore Module" #define ASPNETCORE_EVENT_PROVIDER L"IIS AspNetCore Module V2"
#define ASPNETCORE_IISEXPRESS_EVENT_PROVIDER L"IIS Express AspNetCore Module" #define ASPNETCORE_IISEXPRESS_EVENT_PROVIDER L"IIS Express AspNetCore Module V2"
#define ASPNETCORE_EVENT_MSG_BUFFER_SIZE 256 #define ASPNETCORE_EVENT_MSG_BUFFER_SIZE 256
#define ASPNETCORE_EVENT_PROCESS_START_SUCCESS_MSG L"Application '%s' started process '%d' successfully and process '%d' is listening on port '%d'." #define ASPNETCORE_EVENT_PROCESS_START_SUCCESS_MSG L"Application '%s' started process '%d' successfully and process '%d' is listening on port '%d'."