From 7f7742577d4a65aebd180277d7c0790d6c2e0207 Mon Sep 17 00:00:00 2001 From: moozzyk Date: Thu, 14 Apr 2016 09:11:44 -0700 Subject: [PATCH] Removing .log extension from the log file name AspNetCoreModule appends a timestamp followed by ".log" to log file name. Removing extension prevents from creating log files with names like stdout.log.{timestamp}.log --- .../WebConfigTransform.cs | 2 +- .../WebConfigTransformFacts.cs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration.Tools/WebConfigTransform.cs b/src/Microsoft.AspNetCore.Server.IISIntegration.Tools/WebConfigTransform.cs index edfed37bb1..34d1fdc1fa 100644 --- a/src/Microsoft.AspNetCore.Server.IISIntegration.Tools/WebConfigTransform.cs +++ b/src/Microsoft.AspNetCore.Server.IISIntegration.Tools/WebConfigTransform.cs @@ -60,7 +60,7 @@ 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(configureForAzure ? @"%home%\site" : ".", appName).Replace("/", "\\"); - var logPath = Path.Combine(configureForAzure ? @"\\?\%home%\LogFiles" : @".\logs", "stdout.log").Replace("/", "\\"); + var logPath = Path.Combine(configureForAzure ? @"\\?\%home%\LogFiles" : @".\logs", "stdout").Replace("/", "\\"); aspNetCoreElement.SetAttributeValue("processPath", appPath); SetAttributeValueIfEmpty(aspNetCoreElement, "stdoutLogEnabled", "false"); diff --git a/test/Microsoft.AspNetCore.Server.IISIntegration.Tools.Tests/WebConfigTransformFacts.cs b/test/Microsoft.AspNetCore.Server.IISIntegration.Tools.Tests/WebConfigTransformFacts.cs index 0dbdea3839..0a86a7eef5 100644 --- a/test/Microsoft.AspNetCore.Server.IISIntegration.Tools.Tests/WebConfigTransformFacts.cs +++ b/test/Microsoft.AspNetCore.Server.IISIntegration.Tools.Tests/WebConfigTransformFacts.cs @@ -12,7 +12,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.Tools.Tests - + "); @@ -58,7 +58,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.Tools.Tests [InlineData("aspNetCore", "stdoutLogEnabled", "true")] [InlineData("aspNetCore", "startupTimeLimit", "1200")] [InlineData("aspNetCore", "arguments", "arg1")] - [InlineData("aspNetCore", "stdoutLogFile", "logfile.log")] + [InlineData("aspNetCore", "stdoutLogFile", "logfile")] public void WebConfigTransform_wont_override_custom_values(string elementName, string attributeName, string attributeValue) { var input = WebConfigTemplate; @@ -130,7 +130,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.Tools.Tests } Assert.Equal( - @".\logs\stdout.log", + @".\logs\stdout", (string)WebConfigTransform.Transform(input, "test.exe", configureForAzure: false) .Descendants().Attributes("stdoutLogFile").Single()); } @@ -169,7 +169,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.Tools.Tests Assert.True(XNode.DeepEquals( XDocument.Parse(@"").Root, + stdoutLogFile=""\\?\%home%\LogFiles\stdout"" startupTimeLimit=""3600""/>").Root, aspNetCoreElement)); }