From bc740898cce3638bda9fd1e40dbe5dbd182c451d Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@didalog.de>
Date: Mon, 1 Oct 2018 17:01:07 +0200
Subject: [PATCH] jj: remove milliseconds and productname from default logfiles

---
 Modules.Logging/LogConfig.vb | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/Modules.Logging/LogConfig.vb b/Modules.Logging/LogConfig.vb
index 50a85f53..a97e9800 100644
--- a/Modules.Logging/LogConfig.vb
+++ b/Modules.Logging/LogConfig.vb
@@ -96,15 +96,22 @@ Public Class LogConfig
     Private Const FILE_NAME_FORMAT_DEFAULT As String = "${shortdate}-${var:product}${var:suffix}.log"
     Private Const FILE_NAME_FORMAT_DETAIL As String = "${shortdate}-${var:product}${var:suffix}-Detail.log"
     Private Const FILE_NAME_FORMAT_DEBUG As String = "${shortdate}-${var:product}${var:suffix}-Debug.log"
+    Private Const FILE_NAME_FORMAT_ERROR As String = "${shortdate}-${var:product}${var:suffix}-Error.log"
 
     Private Const TARGET_DEFAULT As String = "defaultTarget"
     Private Const TARGET_DEFAULT_EX As String = "defaultExTarget"
     Private Const TARGET_DETAIL As String = "detailTarget"
     Private Const TARGET_DEBUG As String = "debugTarget"
 
-    Private Const LOG_FORMAT_BASE As String = "${longdate}|${logger}|${level:uppercase=true}"
+    Private Const DATE_FORMAT_LONG As String = "${longdate}"
+    Private Const DATE_FORMAT_DEFAULT As String = "${date:format=yyyy-MM-dd HH\:mm\:ss}"
+
+    Private Const LOG_FORMAT_BASE As String = DATE_FORMAT_DEFAULT & "|${logger:shortName=True}|${level:uppercase=true}"
+    Private Const LOG_FORMAT_BASE_LONG_DATE As String = DATE_FORMAT_LONG & "|${logger:shortName=True}|${level:uppercase=true}"
+
     Private Const LOG_FORMAT_DEFAULT As String = LOG_FORMAT_BASE & " >> ${message}"
     Private Const LOG_FORMAT_EXCEPTION As String = LOG_FORMAT_BASE & " >> ${exception:format=Message}${newline}${exception:format=StackTrace}"
+    Private Const LOG_FORMAT_DEBUG As String = LOG_FORMAT_BASE_LONG_DATE & " >> ${message}"
 
     Private ReadOnly failSafePath As String = Path.GetTempPath()
     Private ReadOnly basePath As String = failSafePath
@@ -260,13 +267,13 @@ Public Class LogConfig
         ' Clear Logging Rules
         config.LoggingRules.Clear()
 
-        ' Add default targets
+        ' Add default rules
         config.AddRuleForOneLevel(LogLevel.Error, TARGET_DEFAULT_EX)
         config.AddRuleForOneLevel(LogLevel.Fatal, TARGET_DEFAULT_EX)
         config.AddRuleForOneLevel(LogLevel.Warn, TARGET_DEFAULT)
         config.AddRuleForOneLevel(LogLevel.Info, TARGET_DETAIL)
 
-        ' Add debug target, if configured
+        ' Add debug rule, if configured
         If Debug Then
             config.AddRuleForOneLevel(LogLevel.Debug, TARGET_DEBUG)
         End If