Added LogFmt support in LoggerPro

lib/loggerpro/LoggerPro.ConsoleAppender.pas

@@ -65,6 +65,12 @@   TLoggerProConsoleAppender = class(TLoggerProAppenderBase)
     procedure WriteLog(const aLogItem: TLogItem); override;
   end;
 
+  TLoggerProConsoleLogFmtAppender = class(TLoggerProConsoleAppender)
+  public
+    constructor Create(ALogItemRenderer: ILogItemRenderer = nil); override;
+    function FormatLog(const ALogItem: TLogItem): string; override;
+  end;
+
   // for some reason, AttachConsole has been left out of Winapi.windows.pas
 function AttachConsole(PID: Cardinal): LongBool; stdcall;
 
@@ -74,7 +80,8 @@ implementation
 
 uses
   Winapi.Windows,
-  Winapi.Messages;
+  Winapi.Messages,
+  LoggerPro.Renderers;
 
 // for some reason, AttachConsole has been left out of Winapi.windows.pas
 const
@@ -186,4 +193,23 @@ procedure TLoggerProConsoleAppender.WriteLog(const aLogItem: TLogItem);
   end;
 end;
 
+{ TLoggerProConsoleLogFmtAppender }
+
+constructor TLoggerProConsoleLogFmtAppender.Create(ALogItemRenderer: ILogItemRenderer);
+begin
+  inherited Create(TLogItemRendererLogFmt.Create);
+end;
+
+function TLoggerProConsoleLogFmtAppender.FormatLog(const ALogItem: TLogItem): string;
+begin
+  if Assigned(FOnLogRow) then
+  begin
+    FOnLogRow(ALogItem, Result);
+  end
+  else
+  begin
+    Result := FLogItemRenderer.RenderLogItem(ALogItem);
+  end;
+end;
+
 end.

lib/loggerpro/LoggerPro.FileAppender.pas

@@ -188,6 +188,17 @@   TLoggerProFileByFolderAppender = class(TLoggerProFileAppender)
     procedure TearDown; override;
   end;
 
+  TLoggerProLogFmtFileAppender = class(TLoggerProSimpleFileAppender)
+  protected
+    function GetLogFileName(const aTag: string; const aFileNumber: Integer): string; override;
+    procedure EmitStartRotateLogItem(aWriter: TStreamWriter); override;
+    procedure EmitEndRotateLogItem(aWriter: TStreamWriter); override;
+  public
+    constructor Create(aMaxBackupFileCount: Integer = TLoggerProFileAppender.DEFAULT_MAX_BACKUP_FILE_COUNT;
+      aMaxFileSizeInKiloByte: Integer = TLoggerProFileAppender.DEFAULT_MAX_FILE_SIZE_KB; aLogsFolder: string = '';
+      aLogFileNameFormat: string = TLoggerProSimpleFileAppender.DEFAULT_FILENAME_FORMAT; aEncoding: TEncoding = nil);
+      reintroduce;
+  end;
 
 implementation
 
@@ -196,8 +207,9 @@ implementation
   System.StrUtils,
   System.Math,
   System.DateUtils,
+  LoggerPro.Renderers,
   idGlobal
-{$IF Defined(Android), System.SysUtils}
+{$IF Defined(Android)}
     ,Androidapi.Helpers
     ,Androidapi.JNI.GraphicsContentViewText
     ,Androidapi.JNI.JavaTypes
@@ -702,5 +714,42 @@ procedure TLoggerProFileByFolderAppender.WriteLog(const ALogItem: TLogItem);
   end;
 end;
 
+{ TLoggerProLogFmtFileAppender }
+
+constructor TLoggerProLogFmtFileAppender.Create(aMaxBackupFileCount, aMaxFileSizeInKiloByte: Integer; aLogsFolder,
+  aLogFileNameFormat: string; aEncoding: TEncoding);
+begin
+  inherited Create(
+    aMaxBackupFileCount,
+    aMaxFileSizeInKiloByte,
+    aLogsFolder,
+    aLogFileNameFormat,
+    TLogItemRendererLogFmt.Create,
+    aEncoding);
+end;
+
+procedure TLoggerProLogFmtFileAppender.EmitEndRotateLogItem(aWriter: TStreamWriter);
+begin
+  // do nothing
+end;
+
+procedure TLoggerProLogFmtFileAppender.EmitStartRotateLogItem(aWriter: TStreamWriter);
+begin
+  // do nothing
+end;
+
+function TLoggerProLogFmtFileAppender.GetLogFileName(const aTag: string; const aFileNumber: Integer): string;
+var
+  lOrigFName, lOrigExt: string;
+begin
+  lOrigFName := inherited;
+  lOrigExt := TPath.GetExtension(lOrigFName);
+  if lOrigExt.IsEmpty then
+  begin
+    lOrigExt := '.log';
+  end;
+  Result := TPath.ChangeExtension(lOrigFName, '.logfmt' + lOrigExt);
+end;
+
 end.
 

lib/loggerpro/LoggerPro.Renderers.pas

@@ -63,6 +63,16 @@   TLogItemRendererNoTagNoThreadID = class(TLogItemRendererDefault)
     function RenderLogItem(const aLogItem: TLogItem): String; override;
   end;
 
+  TLogItemRendererLogFmt = class(TLogItemRenderer)
+  private
+    fFormatSettings: TFormatSettings;
+  protected
+    // ILogLayoutRenderer
+    procedure Setup; override;
+    procedure TearDown; override;
+    function RenderLogItem(const aLogItem: TLogItem): String; override;
+  end;
+
 
 function GetDefaultLogItemRenderer: ILogItemRenderer;
 
@@ -71,6 +81,9 @@ function GetDefaultLogItemRenderer: ILogItemRenderer;
 
 implementation
 
+uses
+  System.DateUtils;
+
 function GetDefaultLogItemRenderer: ILogItemRenderer;
 begin
   Result := gDefaultLogItemRenderer.Create;
@@ -161,5 +174,32 @@ function TLogItemRendererNoTagNoThreadID.RenderLogItem(const aLogItem: TLogItem)
 
 
 
+{ TLogItemRendererLogFmt }
+
+function TLogItemRendererLogFmt.RenderLogItem(const aLogItem: TLogItem): String;
+begin
+  Result :=
+    Format('time=%s threadid=%d type=%s msg=%s tag=%s',
+      [
+        DateToISO8601(ALogItem.TimeStamp, False),
+        ALogItem.ThreadID,
+        ALogItem.LogTypeAsString,
+        ALogItem.LogMessage.QuotedString('"'),
+        ALogItem.LogTag
+        ]);
+end;
+
+procedure TLogItemRendererLogFmt.Setup;
+begin
+  inherited;
+  fFormatSettings := GetDefaultFormatSettings;
+end;
+
+procedure TLogItemRendererLogFmt.TearDown;
+begin
+  inherited;
+
+end;
+
 
 end.

lib/loggerpro/LoggerPro.SimpleConsoleAppender.pas

@@ -44,18 +44,19 @@ interface
   }
   TLoggerProSimpleConsoleAppender = class(TLoggerProAppenderBase)
   public
-    procedure Setup; override;
     procedure TearDown; override;
     procedure WriteLog(const aLogItem: TLogItem); override;
   end;
 
-implementation
+  TLoggerProSimpleConsoleLogFmtAppender = class(TLoggerProSimpleConsoleAppender)
+  public
+    constructor Create; override;
+  end;
 
+implementation
 
-procedure TLoggerProSimpleConsoleAppender.Setup;
-begin
-  inherited;
-end;
+uses
+  LoggerPro.Renderers;
 
 procedure TLoggerProSimpleConsoleAppender.TearDown;
 begin
@@ -67,4 +68,11 @@ procedure TLoggerProSimpleConsoleAppender.WriteLog(const aLogItem: TLogItem);
   Writeln(FormatLog(aLogItem));
 end;
 
+{ TLoggerProSimpleConsoleLogFmtAppender }
+
+constructor TLoggerProSimpleConsoleLogFmtAppender.Create;
+begin
+  inherited Create(TLogItemRendererLogFmt.Create);
+end;
+
 end.

lib/loggerpro/LoggerPro.pas

@@ -285,14 +285,15 @@   TLoggerProAppenderBase = class abstract(TInterfacedObject, ILogAppender)
     FLogLevel: TLogType;
     FEnabled: Boolean;
     FLastErrorTimeStamp: TDateTime;
-    FOnLogRow: TOnAppenderLogRow;
-    FLogItemRenderer: ILogItemRenderer;
     FFormatSettings: TFormatSettings;
   protected
+    FOnLogRow: TOnAppenderLogRow;
+    FLogItemRenderer: ILogItemRenderer;
     property FormatSettings: TFormatSettings read FFormatSettings;
     property LogItemRenderer: ILogItemRenderer read FLogItemRenderer;
   public
-    constructor Create(ALogItemRenderer: ILogItemRenderer = nil); virtual;
+    constructor Create(ALogItemRenderer: ILogItemRenderer); overload; virtual;
+    constructor Create; overload; virtual;
     procedure Setup; virtual;
     function FormatLog(const ALogItem: TLogItem): string; virtual;
     procedure WriteLog(const aLogItem: TLogItem); virtual; abstract;
@@ -887,6 +888,11 @@ constructor TLoggerProAppenderBase.Create(aLogItemRenderer: ILogItemRenderer);
   Self.FOnLogRow := nil;
 end;
 
+constructor TLoggerProAppenderBase.Create;
+begin
+  Create(nil);
+end;
+
 function TLoggerProAppenderBase.FormatLog(const ALogItem: TLogItem): string;
 begin
   if Assigned(FOnLogRow) then

lib/loggerpro/samples/06_logfmt_appender/LoggerProConfig.pas

@@ -0,0 +1,37 @@
+unit LoggerProConfig;
+
+interface
+
+uses
+  LoggerPro, LoggerPro.Renderers;
+
+function Log: ILogWriter;
+
+implementation
+
+uses
+  LoggerPro.ConsoleAppender,
+  LoggerPro.FileAppender,
+  Winapi.Windows;
+
+var
+  _Log: ILogWriter;
+
+function Log: ILogWriter;
+begin
+  Result := _Log;
+end;
+
+initialization
+
+
+
+LoggerPro.Renderers.gDefaultLogItemRenderer := TLogItemRendererNoTag; //optional
+
+_Log := BuildLogWriter([
+  TLoggerProConsoleLogFmtAppender.Create,
+  TLoggerProLogFmtFileAppender.Create]);
+if not IsConsole then
+  AllocConsole;
+
+end.

lib/loggerpro/samples/06_logfmt_appender/logfmt_appender.dpr

@@ -0,0 +1,16 @@
+program logfmt_appender;
+
+uses
+  Vcl.Forms,
+  LoggerProConfig in 'LoggerProConfig.pas',
+  MainFormU in '..\common\MainFormU.pas' {MainForm};
+
+{$R *.res}
+
+begin
+  ReportMemoryLeaksOnShutdown := True;
+  Application.Initialize;
+  Application.MainFormOnTaskbar := True;
+  Application.CreateForm(TMainForm, MainForm);
+  Application.Run;
+end.