3.1.0 (lithium)

danieleteti · Jan 8, 2019 · 5a42665 · 5a42665
1 parent 8ed859b
commit 5a42665
Show file tree

Hide file tree

Showing 21 changed files with 2,297 additions and 717 deletions.
diff --git a/lib/loggerpro/LICENSE b/lib/loggerpro/LICENSE
diff --git a/lib/loggerpro/LOGGERPRO-BUILD-TIMESTAMP.TXT b/lib/loggerpro/LOGGERPRO-BUILD-TIMESTAMP.TXT
@@ -1 +1 @@
-23/10/2018 16:28:28 
+08/01/2019 13:02:09 
diff --git a/releases/3_1_0_lithium/License.txt → lib/loggerpro/License.txt b/releases/3_1_0_lithium/License.txt → lib/loggerpro/License.txt
diff --git a/lib/loggerpro/LoggerPro.FileAppender.pas b/lib/loggerpro/LoggerPro.FileAppender.pas
@@ -82,7 +82,7 @@   TLoggerProFileAppender = class(TLoggerProAppenderBase)
       @item LogTag
       )
     }
-    DEFAULT_FILENAME_FORMAT = '%0:s.%1:2.2d.%2:s.log';
+    DEFAULT_FILENAME_FORMAT = '%s.%2.2d.%s.log';
     { @abstract(Defines number of log file set to mantain during logs rotation) }
     DEFAULT_MAX_BACKUP_FILE_COUNT = 5;
     { @abstract(Defines the max size of each log file)
@@ -325,3 +325,4 @@ function TLoggerProFileAppender.CreateWriter(const aFileName: string): TStreamWr
 end;
 
 end.
+
diff --git a/lib/loggerpro/LoggerPro.MemoryAppender.pas b/lib/loggerpro/LoggerPro.MemoryAppender.pas
@@ -28,35 +28,23 @@
 interface
 
 uses
-  LoggerPro, System.Generics.Collections, System.SyncObjs, System.SysUtils;
+  LoggerPro, System.Generics.Collections, System.SyncObjs, System.SysUtils,
+  ThreadSafeQueueU;
 
 type
-  TMREWObjectList<T: class> = class(TObject)
-  private
-    fList: TObjectList<T>;
-    fMREWSync: TMultiReadExclusiveWriteSynchronizer;
-  public
-    constructor Create; virtual;
-    destructor Destroy; override;
-    function BeginRead: TObjectList<T>;
-    procedure EndRead;
-    function BeginWrite: TObjectList<T>;
-    procedure EndWrite;
-  end;
-
   TMREWLogItemList = class(TMREWObjectList<TLogItem>)
   end;
 
   TLoggerProMemoryAppender = class(TLoggerProAppenderBase)
   private
     fMREWLogList: TMREWLogItemList;
     fTag: string;
-    fMaxSize: UInt32;
+    fMaxSize: Int32;
   public
     procedure Setup; override;
     procedure WriteLog(const aLogItem: TLogItem); override;
     procedure TearDown; override;
-    constructor Create(aLogList: TMREWLogItemList; aTag: string; aMaxSize: UInt32); virtual;
+    constructor Create(aLogList: TMREWLogItemList; aTag: string; aMaxSize: Int32); reintroduce; virtual;
   end;
 
 implementation
@@ -66,7 +54,7 @@ implementation
 
   { TLoggerProMemoryAppender }
 
-constructor TLoggerProMemoryAppender.Create(aLogList: TMREWLogItemList; aTag: string; aMaxSize: UInt32);
+constructor TLoggerProMemoryAppender.Create(aLogList: TMREWLogItemList; aTag: string; aMaxSize: Int32);
 begin
   inherited Create;
   fMREWLogList := aLogList;
@@ -104,44 +92,6 @@ procedure TLoggerProMemoryAppender.WriteLog(const aLogItem: TLogItem);
   end;
 end;
 
-{ TMREWObjectList<T> }
-
-function TMREWObjectList<T>.BeginWrite: TObjectList<T>;
-begin
-  fMREWSync.BeginWrite;
-  Result := fList;
-end;
-
-constructor TMREWObjectList<T>.Create;
-begin
-  inherited;
-  fMREWSync := TMultiReadExclusiveWriteSynchronizer.Create;
-  fList := TObjectList<T>.Create(true);
-end;
-
-destructor TMREWObjectList<T>.Destroy;
-begin
-  fMREWSync.Free;
-  fList.Free;
-  inherited;
-end;
-
-function TMREWObjectList<T>.BeginRead: TObjectList<T>;
-begin
-  fMREWSync.BeginRead;
-  Result := fList;
-end;
-
-procedure TMREWObjectList<T>.EndRead;
-begin
-  fMREWSync.EndRead;
-end;
-
-procedure TMREWObjectList<T>.EndWrite;
-begin
-  fMREWSync.EndWrite;
-end;
-
 initialization
 
 Glock := TObject.Create;

diff --git a/lib/loggerpro/LoggerPro.NSQAppender.pas b/lib/loggerpro/LoggerPro.NSQAppender.pas
@@ -93,7 +93,7 @@   TLoggerProNSQAppenderBase = class(TLoggerProAppenderBase, ILogAppender)
     property OnNetSendError: TOnNetSendError read FOnNetSendError write SetOnNetSendError;
     property Topic: string read GetTopic write SetTopic;
     procedure TearDown; override;
-    procedure Setup;
+    procedure Setup; override;
     procedure WriteLog(const aLogItem: TLogItem); override;
     function CreateData(const SrcLogItem: TLogItem): TStream; virtual;
     function FormatLog(const aLogItem: TLogItem): string; virtual;

diff --git a/lib/loggerpro/LoggerPro.UDPSyslogAppender.pas b/lib/loggerpro/LoggerPro.UDPSyslogAppender.pas
@@ -16,6 +16,7 @@ interface
 
 type
   TLoggerProUDPSyslogAppender = class(TLoggerProAppenderBase)
+  private
     FLoggerProSyslogAppenderClient: TIdUDPClient;
     FIP: string;
     FPort: Integer;
@@ -27,7 +28,6 @@   TLoggerProUDPSyslogAppender = class(TLoggerProAppenderBase)
     FUnixLineBreaks: Boolean;
     FUTF8BOM: Boolean;
 
-
   public
     constructor Create(pIP: string; pPort: Integer; pHostName: string; pUserName: string; pApplication: string;
       pVersion: string; pProcID: string; pUnixLineBreaks: Boolean; pUTF8BOM: Boolean = False); reintroduce;