Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageVersion Include="Microsoft-WindowsAPICodePack-Shell" Version="1.1.5" />
<PackageVersion Include="Mindscape.Raygun4Net.NetCore" Version="11.2.5" />
<PackageVersion Include="NLog.Extensions.Logging" Version="5.5.0" />
<PackageVersion Include="NLog.Extensions.Logging" Version="6.1.1" />
<PackageVersion Include="NServiceBus" Version="10.1.0" />
<PackageVersion Include="NServiceBus.AcceptanceTesting" Version="10.1.0" />
<PackageVersion Include="NServiceBus.AmazonSQS" Version="9.0.0" />
Expand Down
2 changes: 1 addition & 1 deletion src/ServiceControl.Audit/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
}
else
{
LoggingConfigurator.ConfigureNLog("bootstrap.${shortdate}.txt", "./", NLog.LogLevel.Fatal);
LoggingConfigurator.ConfigureNLog("bootstrap.txt", "./", NLog.LogLevel.Fatal);
NLog.LogManager.GetCurrentClassLogger().Fatal(ex, "Unrecoverable error");
}
throw;
Expand Down
5 changes: 2 additions & 3 deletions src/ServiceControl.Infrastructure/LoggingConfigurator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public static void ConfigureLogging(LoggingSettings loggingSettings)
}

var logLevel = loggingSettings.LogLevel.ToNLogLevel();
var loggingTo = ConfigureNLog("logfile.${shortdate}.txt", loggingSettings.LogPath, loggingSettings.LogLevel.ToNLogLevel());
var loggingTo = ConfigureNLog("logfile.txt", loggingSettings.LogPath, loggingSettings.LogLevel.ToNLogLevel());

//using LogManager here rather than LoggerUtil.CreateStaticLogger since this is exclusive to NLog
var logger = LogManager.GetLogger("LoggingConfiguration");
Expand All @@ -43,8 +43,7 @@ public static string ConfigureNLog(string logFileName, string logPath, LogLevel
Name = "file",
ArchiveEvery = FileArchivePeriod.Day,
FileName = Path.Combine(logPath, logFileName),
ArchiveFileName = Path.Combine(logPath, "logfile.{#}.txt"),
ArchiveNumbering = ArchiveNumberingMode.DateAndSequence,
ArchiveSuffixFormat = ".{1:yyyy-MM-dd}.{0:00}",
Layout = simpleLayout,
MaxArchiveFiles = 14,
ArchiveAboveSize = 30 * megaByte
Expand Down
2 changes: 1 addition & 1 deletion src/ServiceControl.Monitoring/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
}
else
{
LoggingConfigurator.ConfigureNLog("bootstrap.${shortdate}.txt", "./", NLog.LogLevel.Fatal);
LoggingConfigurator.ConfigureNLog("bootstrap.txt", "./", NLog.LogLevel.Fatal);
NLog.LogManager.GetCurrentClassLogger().Fatal(ex, "Unrecoverable error");
}
throw;
Expand Down
2 changes: 1 addition & 1 deletion src/ServiceControl/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
}
else
{
LoggingConfigurator.ConfigureNLog("bootstrap.${shortdate}.txt", "./", NLog.LogLevel.Fatal);
LoggingConfigurator.ConfigureNLog("bootstrap.txt", "./", NLog.LogLevel.Fatal);
NLog.LogManager.GetCurrentClassLogger().Fatal(ex, "Unrecoverable error");
}
throw;
Expand Down