Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FileTarget: Add option WriteHeaderWhenInitialFileNotEmpty #5407

Merged
merged 9 commits into from
Nov 14, 2023
Merged
Show file tree
Hide file tree
Changes from 4 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
9 changes: 7 additions & 2 deletions src/NLog/Targets/FileTarget.cs
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,11 @@ public bool ArchiveOldFileOnStartup
set => _archiveOldFileOnStartup = value;
}
private bool? _archiveOldFileOnStartup;

/// <summary>
/// Gets or sets a value indicating whether the header should be written on every startup.
/// </summary>
public bool WriteHeaderOnStartup { get; set; }
RomanSoloweow marked this conversation as resolved.
Show resolved Hide resolved

/// <summary>
/// Gets or sets a value of the file size threshold to archive old log file on startup.
Expand Down Expand Up @@ -2493,8 +2498,8 @@ private void WriteHeaderAndBom(BaseFileAppender appender)
if (Header is null && !WriteBom) return;

var length = appender.GetFileLength();
// Write header and BOM only on empty files or if file info cannot be obtained.
if (length is null || length == 0)
// Write header and BOM only on empty files or if file info cannot be obtained or WriteHeaderOnStartup is true.
if (length is null || length == 0 || WriteHeaderOnStartup)
RomanSoloweow marked this conversation as resolved.
Show resolved Hide resolved
{
if (WriteBom)
{
Expand Down
63 changes: 63 additions & 0 deletions tests/NLog.UnitTests/Targets/FileTargetTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2237,6 +2237,69 @@ public void RepeatingFooterTest(bool writeFooterOnArchivingOnly)
Directory.Delete(tempDir, true);
}
}

[Theory]
[InlineData(false)]
[InlineData(true)]
public void WriteHeaderOnStartupTest(bool writeHeaderOnStartup)
{
var logFile = Path.GetTempFileName() + ".txt";
try
{
const string header = "Headerline";

// Configure first time
var fileTarget = new FileTarget
{
FileName = SimpleLayout.Escape(logFile),
LineEnding = LineEndingMode.LF,
Layout = "${message}",
Header = header,
WriteHeaderOnStartup = true
RomanSoloweow marked this conversation as resolved.
Show resolved Hide resolved
};

LogManager.Setup().LoadConfiguration(c => c.ForLogger().WriteTo(fileTarget));

logger.Debug("aaa");
logger.Info("bbb");
logger.Warn("ccc");

LogManager.Configuration = null;

string headerPart = header + LineEndingMode.LF.NewLineCharacters;
string logPart = "aaa\nbbb\nccc\n";
AssertFileContents(logFile, headerPart + logPart, Encoding.UTF8);

// Configure second time
fileTarget = new FileTarget
{
FileName = SimpleLayout.Escape(logFile),
LineEnding = LineEndingMode.LF,
Layout = "${message}",
Header = header,
WriteHeaderOnStartup = writeHeaderOnStartup
RomanSoloweow marked this conversation as resolved.
Show resolved Hide resolved
};

LogManager.Setup().LoadConfiguration(c => c.ForLogger().WriteTo(fileTarget));

logger.Debug("aaa");
logger.Info("bbb");
logger.Warn("ccc");

LogManager.Configuration = null; // Flush

if (writeHeaderOnStartup)
AssertFileContents(logFile, headerPart + logPart + headerPart + logPart, Encoding.UTF8);
RomanSoloweow marked this conversation as resolved.
Show resolved Hide resolved
else
AssertFileContents(logFile, headerPart + logPart + logPart, Encoding.UTF8);
RomanSoloweow marked this conversation as resolved.
Show resolved Hide resolved
}
finally
{
LogManager.Configuration = null;
if (File.Exists(logFile))
File.Delete(logFile);
}
}

[Theory]
[InlineData(false)]
Expand Down
Loading