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

Improving logs from hostfxr (#25541)

This commit is contained in:
Justin Kotalik 2020-09-02 15:54:41 -07:00 committed by GitHub
parent 2a0b7dc43e
commit d2c31edc14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp
View File

@ -251,10 +251,26 @@ IN_PROCESS_APPLICATION::ExecuteApplication()
LOG_INFOF(L"Setting current directory to %s", this->QueryApplicationPhysicalPath().c_str());
}
auto redirectionOutput = LoggingHelpers::CreateOutputs(
m_pConfig->QueryStdoutLogEnabled(),
m_pConfig->QueryStdoutLogFile(),
QueryApplicationPhysicalPath(),
m_stringRedirectionOutput
);
StandardStreamRedirection redirection(*redirectionOutput.get(), m_pHttpServer.IsCommandLineLaunch());
context->m_redirectionOutput = redirectionOutput.get();
ForwardingRedirectionOutput redirectionForwarder(&context->m_redirectionOutput);
const auto redirect = context->m_hostFxr.RedirectOutput(&redirectionForwarder);
auto startupReturnCode = context->m_hostFxr.InitializeForApp(context->m_argc, context->m_argv.get(), m_dotnetExeKnownLocation);
if (startupReturnCode != 0)
{
throw InvalidOperationException(format(L"Error occurred when initializing in-process application, Return code: 0x%x", startupReturnCode));
auto content = m_stringRedirectionOutput->GetOutput();
throw InvalidOperationException(format(L"Error occurred when initializing in-process application, Return code: 0x%x, Error logs: %ls", startupReturnCode, content.c_str()));
}
if (m_pConfig->QueryCallStartupHook())
@ -280,17 +296,6 @@ IN_PROCESS_APPLICATION::ExecuteApplication()
bool clrThreadExited;
{
auto redirectionOutput = LoggingHelpers::CreateOutputs(
m_pConfig->QueryStdoutLogEnabled(),
m_pConfig->QueryStdoutLogFile(),
QueryApplicationPhysicalPath(),
m_stringRedirectionOutput
);
StandardStreamRedirection redirection(*redirectionOutput.get(), m_pHttpServer.IsCommandLineLaunch());
context->m_redirectionOutput = redirectionOutput.get();
//Start CLR thread
m_clrThread = std::thread(ClrThreadEntryPoint, context);
@ -480,8 +485,6 @@ IN_PROCESS_APPLICATION::ClrThreadEntryPoint(const std::shared_ptr<ExecuteClrCont
{
// We use forwarder here instead of context->m_errorWriter itself to be able to
// disconnect listener before CLR exits
ForwardingRedirectionOutput redirectionForwarder(&context->m_redirectionOutput);
const auto redirect = context->m_hostFxr.RedirectOutput(&redirectionForwarder);
ExecuteClr(context);
}