From 90cd6ce469f6fc1adc534f12ae1bb26ecc05a0f7 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Fri, 22 Apr 2022 13:40:22 +0200 Subject: [PATCH] Logging: Deactivate Memory target --- Modules.Logging/LogConfig.vb | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/Modules.Logging/LogConfig.vb b/Modules.Logging/LogConfig.vb index 29c879e0..0e60f029 100644 --- a/Modules.Logging/LogConfig.vb +++ b/Modules.Logging/LogConfig.vb @@ -81,7 +81,7 @@ Public Class LogConfig Private Const TARGET_ERROR As String = "errorTarget" Private Const TARGET_DEBUG As String = "debugTarget" Private Const TARGET_TRACE As String = "traceTarget" - Private Const TARGET_MEMORY As String = "memoryTarget" + 'Private Const TARGET_MEMORY As String = "memoryTarget" Private Const LOG_FORMAT_BASE As String = "${time}|${logger:shortName=True}|${level:uppercase=true}" Private Const LOG_FORMAT_CALLSITE As String = "${callsite:className=false:fileName=true:includeSourcePath=false:methodName=true}" @@ -95,7 +95,7 @@ Public Class LogConfig Private Const FOLDER_NAME_LOG = "Log" Private Const FILE_KEEP_RANGE As Integer = 30 - Private Const MAX_MEMORY_LOG_COUNT As Integer = 1000 + 'Private Const MAX_MEMORY_LOG_COUNT As Integer = 1000 Private ReadOnly _failSafePath As String = Path.GetTempPath() Private ReadOnly _basePath As String = _failSafePath @@ -162,8 +162,9 @@ Public Class LogConfig ''' A list of log messages Public ReadOnly Property Logs As List(Of String) Get - Dim oTarget = _config.FindTargetByName(Of MemoryTarget)(TARGET_MEMORY) - Return oTarget?.Logs.ToList() + 'Dim oTarget = _config.FindTargetByName(Of MemoryTarget)(TARGET_MEMORY) + 'Return oTarget?.Logs.ToList() + Return New List(Of String) End Get End Property @@ -374,8 +375,8 @@ Public Class LogConfig ''' Clears the internal log ''' Public Sub ClearLogs() - Dim oTarget = _config.FindTargetByName(Of MemoryTarget)(TARGET_MEMORY) - oTarget?.Logs.Clear() + 'Dim oTarget = _config.FindTargetByName(Of MemoryTarget)(TARGET_MEMORY) + 'oTarget?.Logs.Clear() End Sub ''' @@ -443,7 +444,7 @@ Public Class LogConfig _config.AddTarget(TARGET_DEFAULT, GetDefaultLogTarget(_basePath)) _config.AddTarget(TARGET_DEBUG, GetDebugLogTarget(_basePath)) _config.AddTarget(TARGET_TRACE, GetTraceLogTarget(_basePath)) - _config.AddTarget(TARGET_MEMORY, GetMemoryDebugTarget()) + '_config.AddTarget(TARGET_MEMORY, GetMemoryDebugTarget()) ' Add default rules AddDefaultRules(_config) @@ -460,7 +461,7 @@ Public Class LogConfig config.AddRuleForOneLevel(LogLevel.Fatal, TARGET_ERROR_EX) config.AddRuleForOneLevel(LogLevel.Warn, TARGET_DEFAULT) config.AddRuleForOneLevel(LogLevel.Info, TARGET_DEFAULT) - config.AddRuleForAllLevels(TARGET_MEMORY) + 'config.AddRuleForAllLevels(TARGET_MEMORY) End Sub ''' @@ -576,15 +577,15 @@ Public Class LogConfig Return debugLog End Function - Private Function GetMemoryDebugTarget() As MemoryTarget - Dim memoryLog As New MemoryTarget() With { - .Layout = LOG_FORMAT_DEBUG, - .Name = TARGET_MEMORY, - .OptimizeBufferReuse = True, - .MaxLogsCount = MAX_MEMORY_LOG_COUNT - } + 'Private Function GetMemoryDebugTarget() As MemoryTarget + ' Dim memoryLog As New MemoryTarget() With { + ' .Layout = LOG_FORMAT_DEBUG, + ' .Name = TARGET_MEMORY, + ' .OptimizeBufferReuse = True, + ' .MaxLogsCount = MAX_MEMORY_LOG_COUNT + ' } - Return memoryLog - End Function + ' Return memoryLog + 'End Function #End Region End Class