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

Create folders for debug log file (#6546)

This commit is contained in:
Pavel Krymets 2019-01-10 12:03:54 -08:00 committed by GitHub
parent 5887e412c6
commit 26c78ee542
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Servers/IIS/AspNetCoreModuleV2/CommonLib/debugutil.cpp
View File

@ -123,7 +123,7 @@ void SetDebugFlags(const std::wstring &debugValue)
} }
} }
bool CreateDebugLogFile(const std::wstring &debugOutputFile) bool CreateDebugLogFile(const std::filesystem::path &debugOutputFile)
{ {
try try
{ {
@ -140,6 +140,11 @@ bool CreateDebugLogFile(const std::wstring &debugOutputFile)
CloseHandle(g_logFile); CloseHandle(g_logFile);
g_logFile = INVALID_HANDLE_VALUE; g_logFile = INVALID_HANDLE_VALUE;
} }
// ignore errors
std::error_code ec;
create_directories(debugOutputFile.parent_path(), ec);
g_logFile = CreateFileW(debugOutputFile.c_str(), g_logFile = CreateFileW(debugOutputFile.c_str(),
(GENERIC_READ | GENERIC_WRITE), (GENERIC_READ | GENERIC_WRITE),
(FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE), (FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE),
@ -348,13 +353,13 @@ DebugPrintW(
WORD eventType; WORD eventType;
switch (dwFlag) switch (dwFlag)
{ {
case ASPNETCORE_DEBUG_FLAG_ERROR: case ASPNETCORE_DEBUG_FLAG_ERROR:
eventType = EVENTLOG_ERROR_TYPE; eventType = EVENTLOG_ERROR_TYPE;
break; break;
case ASPNETCORE_DEBUG_FLAG_WARNING: case ASPNETCORE_DEBUG_FLAG_WARNING:
eventType = EVENTLOG_WARNING_TYPE; eventType = EVENTLOG_WARNING_TYPE;
break; break;
default: default:
eventType = EVENTLOG_INFORMATION_TYPE; eventType = EVENTLOG_INFORMATION_TYPE;
break; break;
} }

5
src/Servers/IIS/IIS/test/Common.FunctionalTests/LogFileTests.cs
View File

@ -85,17 +85,18 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
[ConditionalTheory] [ConditionalTheory]
[MemberData(nameof(TestVariants))] [MemberData(nameof(TestVariants))]
[RequiresNewShim]
public async Task StartupMessagesAreLoggedIntoDebugLogFile(TestVariant variant) public async Task StartupMessagesAreLoggedIntoDebugLogFile(TestVariant variant)
{ {
var deploymentParameters = _fixture.GetBaseDeploymentParameters(variant, publish: true); var deploymentParameters = _fixture.GetBaseDeploymentParameters(variant, publish: true);
deploymentParameters.HandlerSettings["debugLevel"] = "file"; deploymentParameters.HandlerSettings["debugLevel"] = "file";
deploymentParameters.HandlerSettings["debugFile"] = "debug.txt"; deploymentParameters.HandlerSettings["debugFile"] = "subdirectory\\debug.txt";
var deploymentResult = await DeployAsync(deploymentParameters); var deploymentResult = await DeployAsync(deploymentParameters);
await deploymentResult.HttpClient.GetAsync("/"); await deploymentResult.HttpClient.GetAsync("/");
AssertLogs(Path.Combine(deploymentResult.ContentRoot, "debug.txt")); AssertLogs(Path.Combine(deploymentResult.ContentRoot, "subdirectory", "debug.txt"));
} }
[ConditionalTheory] [ConditionalTheory]