diff --git a/barraider-sdtools/LayoutRenderers/ElapsedTimeLayoutRenderer.cs b/barraider-sdtools/LayoutRenderers/ElapsedTimeLayoutRenderer.cs new file mode 100644 index 0000000..19cabaa --- /dev/null +++ b/barraider-sdtools/LayoutRenderers/ElapsedTimeLayoutRenderer.cs @@ -0,0 +1,35 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Text; +using System.Text.RegularExpressions; +using NLog; +using NLog.LayoutRenderers; + +namespace BarRaider.SdTools.LayoutRenderers +{ + /// + /// Renderer to get the time elapsed since the last logged event. + /// + [LayoutRenderer("elapsed-time")] + public class ElapsedTimeLayoutRenderer : LayoutRenderer + { + private DateTime? _lastTimeStamp; + + /// + /// Append elapsed time since the last log entry in milliseconds to the log + /// + /// StringBuilder containing log parts, the result is appended to this StringBuilder + /// not used + protected override void Append(StringBuilder builder, LogEventInfo logEvent) + { + DateTime now = DateTime.Now; + var lastTimeStamp = _lastTimeStamp ?? now; + var elapsedTime = now - lastTimeStamp; + var elapsedTimeString = $"{elapsedTime.TotalMilliseconds:f4}".PadLeft(10); + builder.Append($"{elapsedTimeString}ms"); + _lastTimeStamp = now; + } + } + +} diff --git a/barraider-sdtools/LayoutRenderers/RealTimeLayoutRenderer.cs b/barraider-sdtools/LayoutRenderers/RealTimeLayoutRenderer.cs new file mode 100644 index 0000000..a0b6260 --- /dev/null +++ b/barraider-sdtools/LayoutRenderers/RealTimeLayoutRenderer.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Text; +using System.Text.RegularExpressions; +using NLog; +using NLog.LayoutRenderers; + +namespace BarRaider.SdTools.LayoutRenderers +{ + /// + /// Renderer to get the real time added to the log. Uses the real time (DateTime.Now) instead of the logEvent.TimeStamp since that TimeStamp seems to be some clustered timestamp used for multiple log entries. + /// + [LayoutRenderer("real-time")] + public class RealTimeLayoutRenderer : LayoutRenderer + { + /// + /// Append DateTime.Now including milliseconds to the log + /// + /// StringBuilder containing log parts, the result is appended to this StringBuilder + /// not used + protected override void Append(StringBuilder builder, LogEventInfo logEvent) + { + builder.Append($"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff")}"); + } + } +} diff --git a/barraider-sdtools/Logger.cs b/barraider-sdtools/Logger.cs index 63ee624..d02505c 100644 --- a/barraider-sdtools/Logger.cs +++ b/barraider-sdtools/Logger.cs @@ -1,4 +1,7 @@ using NLog; +using NLog.Config; +using NLog.LayoutRenderers; +using NLog.Targets; using System; using System.Collections.Generic; using System.Linq; @@ -67,14 +70,34 @@ public static Logger Instance return instance; } } - } + } + + /// + /// Set logging format. In addition to the standard layouts defined for NLog, ${real-time} ${elapsed-time} are available. + /// + /// "https://nlog-project.org/config/?tab=layout-renderers" + public string Layout + { + get + { + LoggingConfiguration lc = NLog.LogManager.Configuration; + return ((FileTarget)lc.LoggingRules[0].Targets[0]).Layout.ToString(); + } + set + { + LoggingConfiguration lc = NLog.LogManager.Configuration; + ((FileTarget)lc.LoggingRules[0].Targets[0]).Layout = value; + } + } private readonly NLog.Logger log = null; private Logger() { - var config = new NLog.Config.LoggingConfiguration(); - var logfile = new NLog.Targets.FileTarget("logfile") { FileName = "pluginlog.log", ArchiveEvery=NLog.Targets.FileArchivePeriod.Day, MaxArchiveFiles=10, ArchiveFileName="logs/log.{###}.log", ArchiveNumbering=NLog.Targets.ArchiveNumberingMode.Rolling }; - config.AddRule(LogLevel.Debug, LogLevel.Fatal, logfile); + LayoutRenderer.Register("elapsed-time"); + LayoutRenderer.Register("real-time"); + var config = new NLog.Config.LoggingConfiguration(); + var logfile = new NLog.Targets.FileTarget("logfile") { FileName = "pluginlog.log", ArchiveEvery=NLog.Targets.FileArchivePeriod.Day, MaxArchiveFiles=10, ArchiveFileName="logs/log.{###}.log", ArchiveNumbering=NLog.Targets.ArchiveNumberingMode.Rolling}; + config.AddRule(LogLevel.Debug, LogLevel.Fatal, logfile); NLog.LogManager.Configuration = config; log = LogManager.GetCurrentClassLogger(); LogMessage(TracingLevel.DEBUG, "Logger Initialized");