8000 TraceTarget - Fixed Header output by snakefoot · Pull Request #5682 · NLog/NLog · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

TraceTarget - Fixed Header output #5682

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jan 30, 2025
Merged

TraceTarget - Fixed Header output #5682

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 16 additions & 9 deletions src/NLog/Targets/TraceTarget.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,8 @@ protected override void InitializeTarget()

if (Header != null)
{
Trace.WriteLine(RenderLogEvent(Footer, LogEventInfo.CreateNullEvent()));
string logMessage = RenderLogEvent(Header, LogEventInfo.CreateNullEvent());
TraceWrite(LogLevel.Debug, logMessage);
}
}

Expand All @@ -114,7 +115,8 @@ protected override void CloseTarget()
{
if (Footer != null)
{
Trace.WriteLine(RenderLogEvent(Footer, LogEventInfo.CreateNullEvent()));
string logMessage = RenderLogEvent(Footer, LogEventInfo.CreateNullEvent());
TraceWrite(LogLevel.Debug, logMessage);
}

base.CloseTarget();
Expand All @@ -136,23 +138,28 @@ protected override void CloseTarget()
protected override void Write(LogEventInfo logEvent)
{
string logMessage = RenderLogEvent(Layout, logEvent);
if (RawWrite || logEvent.Level <= LogLevel.Debug)
TraceWrite(logEvent.Level, logMessage);
}

private void TraceWrite(LogLevel logLevel, string logMessage)
{
if (RawWrite || logLevel <= LogLevel.Debug)
{
Trace.WriteLine(logMessage);
Trace.WriteLine(logMessage); // NOSONAR
}
else if (logEvent.Level == LogLevel.Info)
else if (logLevel == LogLevel.Info)
{
Trace.TraceInformation(logMessage);
}
else if (logEvent.Level == LogLevel.Warn)
else if (logLevel == LogLevel.Warn)
{
Trace.TraceWarning(logMessage);
}
else if (logEvent.Level == LogLevel.Error)
else if (logLevel == LogLevel.Error)
{
Trace.TraceError(logMessage);
}
else if (logEvent.Level >= LogLevel.Fatal)
else if (logLevel >= LogLevel.Fatal)
{
if (EnableTraceFail)
Trace.Fail(logMessage); // Can throw exceptions, show message dialog or perform Environment.FailFast
Expand All @@ -161,7 +168,7 @@ protected override void Write(LogEventInfo logEvent)
}
else
{
Trace.WriteLine(logMessage);
Trace.WriteLine(logMessage); // NOSONAR
}
}
}
Expand Down
0