|
1 | 1 | using System; |
2 | 2 | using System.Runtime.CompilerServices; |
3 | 3 | using System.Text; |
| 4 | +using System.Threading; |
4 | 5 | using Serilog.Core; |
5 | 6 |
|
6 | 7 | namespace Microsoft.PowerShell.EditorServices.Utility |
@@ -54,27 +55,27 @@ public void Write( |
54 | 55 | string indentedLogMsg = IndentMsg(logMessage); |
55 | 56 | string logLevelName = logLevel.ToString().ToUpper(); |
56 | 57 |
|
| 58 | + int threadId = Thread.CurrentThread.ManagedThreadId; |
| 59 | + |
| 60 | + string messageTemplate = |
| 61 | + "[{LogLevelName:l}] tid:{threadId} in '{CallerName:l}' {CallerSourceFile:l}:{CallerLineNumber}:{IndentedLogMsg:l}"; |
| 62 | + |
57 | 63 | switch (logLevel) |
58 | 64 | { |
59 | 65 | case LogLevel.Diagnostic: |
60 | | - _logger.Verbose("[{LogLevelName:l}] {CallerSourceFile:l}: In method '{CallerName:l}', line {CallerLineNumber}:{IndentedLogMsg:l}", |
61 | | - logLevelName, callerSourceFile, callerName, callerLineNumber, indentedLogMsg); |
| 66 | + _logger.Verbose(messageTemplate, logLevelName, threadId, callerName, callerSourceFile, callerLineNumber, indentedLogMsg); |
62 | 67 | return; |
63 | 68 | case LogLevel.Verbose: |
64 | | - _logger.Debug("[{LogLevelName:l}] {CallerSourceFile:l}: In method '{CallerName:l}', line {CallerLineNumber}:{IndentedLogMsg:l}", |
65 | | - logLevelName, callerSourceFile, callerName, callerLineNumber, indentedLogMsg); |
| 69 | + _logger.Debug(messageTemplate, logLevelName, threadId, callerName, callerSourceFile, callerLineNumber, indentedLogMsg); |
66 | 70 | return; |
67 | 71 | case LogLevel.Normal: |
68 | | - _logger.Information("[{LogLevelName:l}] {CallerSourceFile:l}: In method '{CallerName:l}', line {CallerLineNumber}:{IndentedLogMsg:l}", |
69 | | - logLevelName, callerSourceFile, callerName, callerLineNumber, indentedLogMsg); |
| 72 | + _logger.Information(messageTemplate, logLevelName, threadId, callerName, callerSourceFile, callerLineNumber, indentedLogMsg); |
70 | 73 | return; |
71 | 74 | case LogLevel.Warning: |
72 | | - _logger.Warning("[{LogLevelName:l}] {CallerSourceFile:l}: In method '{CallerName:l}', line {CallerLineNumber}:{IndentedLogMsg:l}", |
73 | | - logLevelName, callerSourceFile, callerName, callerLineNumber, indentedLogMsg); |
| 75 | + _logger.Warning(messageTemplate, logLevelName, threadId, callerName, callerSourceFile, callerLineNumber, indentedLogMsg); |
74 | 76 | return; |
75 | 77 | case LogLevel.Error: |
76 | | - _logger.Error("[{LogLevelName:l}] {CallerSourceFile:l}: In method '{CallerName:l}', line {CallerLineNumber}:{IndentedLogMsg:l}", |
77 | | - logLevelName, callerSourceFile, callerName, callerLineNumber, indentedLogMsg); |
| 78 | + _logger.Error(messageTemplate, logLevelName, threadId, callerName, callerSourceFile, callerLineNumber, indentedLogMsg); |
78 | 79 | return; |
79 | 80 | } |
80 | 81 | } |
|
0 commit comments