Skip to content

Add managed thread id to log output to add debugging threading issues #790

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 2 commits into from
Nov 12, 2018
Merged

Add managed thread id to log output to add debugging threading issues #790

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5053cb
Add managed thread id to log output to add debugging threading issues
rkeithhill Nov 5, 2018
35cd7f3
Lessen log output a bit - remove 'method' and [] around the thread id
rkeithhill Nov 10, 2018
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
21 changes: 11 additions & 10 deletions src/PowerShellEditorServices/Utility/PsesLogger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System;
using System.Runtime.CompilerServices;
using System.Text;
using System.Threading;
using Serilog.Core;

namespace Microsoft.PowerShell.EditorServices.Utility
Expand Down Expand Up @@ -54,27 +55,27 @@ public void Write(
string indentedLogMsg = IndentMsg(logMessage);
string logLevelName = logLevel.ToString().ToUpper();

int threadId = Thread.CurrentThread.ManagedThreadId;

string messageTemplate =
"[{LogLevelName:l}] tid:{threadId} in '{CallerName:l}' {CallerSourceFile:l}:{CallerLineNumber}:{IndentedLogMsg:l}";

switch (logLevel)
{
case LogLevel.Diagnostic:
_logger.Verbose("[{LogLevelName:l}] {CallerSourceFile:l}: In method '{CallerName:l}', line {CallerLineNumber}:{IndentedLogMsg:l}",
logLevelName, callerSourceFile, callerName, callerLineNumber, indentedLogMsg);
_logger.Verbose(messageTemplate, logLevelName, threadId, callerName, callerSourceFile, callerLineNumber, indentedLogMsg);
return;
case LogLevel.Verbose:
_logger.Debug("[{LogLevelName:l}] {CallerSourceFile:l}: In method '{CallerName:l}', line {CallerLineNumber}:{IndentedLogMsg:l}",
logLevelName, callerSourceFile, callerName, callerLineNumber, indentedLogMsg);
_logger.Debug(messageTemplate, logLevelName, threadId, callerName, callerSourceFile, callerLineNumber, indentedLogMsg);
return;
case LogLevel.Normal:
_logger.Information("[{LogLevelName:l}] {CallerSourceFile:l}: In method '{CallerName:l}', line {CallerLineNumber}:{IndentedLogMsg:l}",
logLevelName, callerSourceFile, callerName, callerLineNumber, indentedLogMsg);
_logger.Information(messageTemplate, logLevelName, threadId, callerName, callerSourceFile, callerLineNumber, indentedLogMsg);
return;
case LogLevel.Warning:
_logger.Warning("[{LogLevelName:l}] {CallerSourceFile:l}: In method '{CallerName:l}', line {CallerLineNumber}:{IndentedLogMsg:l}",
logLevelName, callerSourceFile, callerName, callerLineNumber, indentedLogMsg);
_logger.Warning(messageTemplate, logLevelName, threadId, callerName, callerSourceFile, callerLineNumber, indentedLogMsg);
return;
case LogLevel.Error:
_logger.Error("[{LogLevelName:l}] {CallerSourceFile:l}: In method '{CallerName:l}', line {CallerLineNumber}:{IndentedLogMsg:l}",
logLevelName, callerSourceFile, callerName, callerLineNumber, indentedLogMsg);
_logger.Error(messageTemplate, logLevelName, threadId, callerName, callerSourceFile, callerLineNumber, indentedLogMsg);
return;
}
}
Expand Down