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

Always overwrite stdoutLogPath when publishing for Azure 

Addresses #167
This commit is contained in:
moozzyk 2016-05-30 22:15:14 -07:00 committed by moozzyk
parent f45e533533
commit 31a6a126e3
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Microsoft.AspNetCore.Server.IISIntegration.Tools/WebConfigTransform.cs
View File

@ -60,7 +60,6 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.Tools
// Forward slashes currently work neither in AspNetCoreModule nor in dotnet so they need to be
// replaced with backwards slashes when the application is published on a non-Windows machine
var appPath = Path.Combine(".", appName).Replace("/", "\\");
var logPath = Path.Combine(configureForAzure ? @"\\?\%home%\LogFiles" : @".\logs", "stdout").Replace("/", "\\");
RemoveLauncherArgs(aspNetCoreElement);
if (!isPortable)
@ -85,7 +84,19 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.Tools
}
SetAttributeValueIfEmpty(aspNetCoreElement, "stdoutLogEnabled", "false");
SetAttributeValueIfEmpty(aspNetCoreElement, "stdoutLogFile", logPath);
var logPath = Path.Combine(configureForAzure ? @"\\?\%home%\LogFiles" : @".\logs", "stdout").Replace("/", "\\");
if (configureForAzure)
{
// When publishing for Azure we want to always overwrite path - the folder we set the path to
// will exist, the path is not easy to customize and stdoutLogPath should be only used for
// diagnostic purposes
aspNetCoreElement.SetAttributeValue("stdoutLogFile", logPath);
}
else
{
SetAttributeValueIfEmpty(aspNetCoreElement, "stdoutLogFile", logPath);
}
}
private static XElement GetOrCreateChild(XElement parent, string childName)

11
test/Microsoft.AspNetCore.Server.IISIntegration.Tools.Tests/WebConfigTransformFacts.cs
View File

@ -173,6 +173,17 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.Tools.Tests
aspNetCoreElement));
}
[Fact]
public void WebConfigTransform_overwrites_stdoutLogPath_for_Azure()
{
var input = WebConfigTemplate;
var output = WebConfigTransform.Transform(input, "test.exe", configureForAzure: true, isPortable: false);
Assert.Equal(
@"\\?\%home%\LogFiles\stdout",
(string)output.Descendants("aspNetCore").Single().Attribute("stdoutLogFile"));
}
[Fact]
public void WebConfigTransform_configures_portable_apps_correctly()
{