Logging: Remove Warning from Error Log, Add Sublogging with Modules, Revert own Logger methods
This commit is contained in:
@@ -2,70 +2,7 @@
|
||||
|
||||
Public Class Logger
|
||||
Inherits NLog.Logger
|
||||
Implements ILogger
|
||||
|
||||
''' <summary>
|
||||
''' Optional ModuleName to create different LogFiles for different Modules (arbitrary entities, User, File, etc.)
|
||||
''' </summary>
|
||||
''' <returns>The current ModuleName of the logger, if any.</returns>
|
||||
Public Property ModuleName As String = Nothing
|
||||
|
||||
<DebuggerStepThrough>
|
||||
Public Overloads Sub Info(Message As String)
|
||||
LogWithModuleName(Message, LogLevel.Info)
|
||||
End Sub
|
||||
|
||||
<DebuggerStepThrough>
|
||||
Public Overloads Sub Warn(Message As String)
|
||||
LogWithModuleName(Message, LogLevel.Warn)
|
||||
End Sub
|
||||
|
||||
<DebuggerStepThrough>
|
||||
Public Overloads Sub [Error](Exception As Exception)
|
||||
LogWithModuleName(Exception)
|
||||
End Sub
|
||||
|
||||
<DebuggerStepThrough>
|
||||
Public Overloads Sub Debug(Message As String)
|
||||
LogWithModuleName(Message, LogLevel.Debug)
|
||||
End Sub
|
||||
|
||||
<DebuggerStepThrough>
|
||||
Public Overloads Sub Trace(Message As String)
|
||||
LogWithModuleName(Message, LogLevel.Trace)
|
||||
End Sub
|
||||
|
||||
Private Sub LogWithModuleName(Exception As Exception)
|
||||
Dim oEventInfo As New LogEventInfo() With {
|
||||
.Exception = Exception,
|
||||
.Level = LogLevel.Error,
|
||||
.LoggerName = Name,
|
||||
.Message = Exception.Message
|
||||
}
|
||||
oEventInfo = MaybeSetModuleName(oEventInfo)
|
||||
|
||||
Log(oEventInfo)
|
||||
End Sub
|
||||
|
||||
Private Sub LogWithModuleName(Message As String, LogLevel As LogLevel)
|
||||
Dim oEventInfo As New LogEventInfo(LogLevel, Name, Message)
|
||||
oEventInfo = MaybeSetModuleName(oEventInfo)
|
||||
|
||||
Log(oEventInfo)
|
||||
End Sub
|
||||
|
||||
Private Function MaybeSetModuleName(LogEventInfo As LogEventInfo) As LogEventInfo
|
||||
If ModuleName IsNot Nothing AndAlso ModuleName <> String.Empty Then
|
||||
LogEventInfo.Properties.Item("ModuleName") = ModuleName
|
||||
End If
|
||||
|
||||
Return LogEventInfo
|
||||
End Function
|
||||
|
||||
''' <summary>
|
||||
''' Prints a preformatted Block including a block identifier
|
||||
''' </summary>
|
||||
''' <param name="blockId">A unique Identifier for this block, eg. DocId, FullPath, ..</param>
|
||||
<DebuggerStepThrough()>
|
||||
Public Sub NewBlock(blockId As String)
|
||||
Dim message As String = $"-----> Start of Block {blockId}"
|
||||
|
||||
Reference in New Issue
Block a user