Merge branch 'mark-lobanov'

Author: danieleteti

lib/loggerpro/LoggerPro.JSONLFileAppender.pas

@@ -170,7 +170,7 @@ function TLogItemRendererJSONL.RenderLogItem(const aLogItem: TLogItem): String;
     lJSON.AddPair('message', ALogItem.LogMessage);
     lJSON.AddPair('tag', ALogItem.LogTag);
     lJSON.AddPair('hostname', fHostName);
-    lJSON.AddPair('tid', ALogItem.ThreadID);
+    lJSON.AddPair('tid', ALogItem.ThreadID.ToString);
     if ALogItem.HasContext then
     begin
       lContextObj := TJSONObject.Create;

lib/loggerpro/LoggerPro.TimeRotatingFileAppender.pas

@@ -28,6 +28,7 @@ interface
 
 uses
   LoggerPro,
+  System.Types,
   System.SysUtils,
   System.Classes,
   System.IOUtils,
@@ -257,7 +258,7 @@ procedure TLoggerProTimeRotatingFileAppender.RotateIfNeeded(aCurrentDateTime: TD
 
 procedure TLoggerProTimeRotatingFileAppender.CleanupOldFiles;
 var
-  lFiles: TArray<string>;
+  lFiles: TStringDynArray;
   lPattern: string;
   I: Integer;
 begin

lib/loggerpro/LoggerPro.VCLListBoxAppender.pas

@@ -29,6 +29,7 @@
 
 interface
 
+{$IF Defined(MSWINDOWS)}
 uses
   LoggerPro,
   System.Classes,
@@ -46,9 +47,10 @@   TVCLListBoxAppender = class(TLoggerProAppenderBase)
     procedure TearDown; override;
     procedure WriteLog(const aLogItem: TLogItem); override;
   end;
-
+{$ENDIF}
 implementation
 
+{$IF Defined(MSWINDOWS)}
 uses
   System.SysUtils;
 
@@ -100,4 +102,6 @@ procedure TVCLListBoxAppender.WriteLog(const aLogItem: TLogItem);
     end);
 end;
 
+{$ENDIF}
+
 end.

lib/loggerpro/LoggerPro.VCLListViewAppender.pas

@@ -26,6 +26,8 @@
 
 interface
 
+{$IF Defined(MSWINDOWS)}
+
 uses
   LoggerPro,
   System.Classes,
@@ -44,8 +46,12 @@   TVCLListViewAppender = class(TLoggerProAppenderBase)
     procedure WriteLog(const aLogItem: TLogItem); override;
   end;
 
+{$ENDIF}
+
 implementation
 
+{$IF Defined(MSWINDOWS)}
+
 uses
   System.SysUtils,
   Winapi.Windows,
@@ -102,4 +108,6 @@ procedure TVCLListViewAppender.WriteLog(const aLogItem: TLogItem);
     end);
 end;
 
+{$ENDIF}
+
 end.

lib/loggerpro/LoggerPro.VCLMemoAppender.pas

@@ -26,6 +26,8 @@
 
 interface
 
+{$IF Defined(MSWINDOWS)}
+
 uses
   LoggerPro,
   System.Classes,
@@ -45,8 +47,12 @@   TVCLMemoLogAppender = class(TLoggerProAppenderBase)
     procedure WriteLog(const aLogItem: TLogItem); override;
   end;
 
+{$ENDIF}
+
 implementation
 
+{$IF Defined(MSWINDOWS)}
+
 uses
   System.SysUtils,
   Winapi.Windows,
@@ -105,4 +111,5 @@ procedure TVCLMemoLogAppender.WriteLog(const aLogItem: TLogItem);
     end);
 end;
 
+{$ENDIF}
 end.

lib/loggerpro/packages/d130/loggerproRT.dpk

@@ -13,8 +13,8 @@ package loggerproRT;
 {$LONGSTRINGS ON}
 {$OPENSTRINGS ON}
 {$OPTIMIZATION OFF}
-{$OVERFLOWCHECKS OFF}
-{$RANGECHECKS OFF}
+{$OVERFLOWCHECKS ON}
+{$RANGECHECKS ON}
 {$REFERENCEINFO ON}
 {$SAFEDIVIDE OFF}
 {$STACKFRAMES ON}
@@ -34,7 +34,9 @@ requires
   rtl,
   IndySystem,
   IndyProtocols,
-  IndyCore;
+  IndyCore,
+  FireDAC,
+  vcl;
 
 contains
   LoggerPro in '..\..\LoggerPro.pas',
@@ -54,6 +56,13 @@ contains
   LoggerPro.TimeRotatingFileAppender in '..\..\LoggerPro.TimeRotatingFileAppender.pas',
   LoggerPro.UDPSyslogAppender in '..\..\LoggerPro.UDPSyslogAppender.pas',
   LoggerPro.Utils in '..\..\LoggerPro.Utils.pas',
-  ThreadSafeQueueU in '..\..\ThreadSafeQueueU.pas';
+  ThreadSafeQueueU in '..\..\ThreadSafeQueueU.pas',
+  LoggerPro.Builder in '..\..\LoggerPro.Builder.pas',
+  LoggerPro.DBAppender.FireDAC in '..\..\LoggerPro.DBAppender.FireDAC.pas',
+  LoggerPro.DBAppender in '..\..\LoggerPro.DBAppender.pas',
+  LoggerPro.VCLListBoxAppender in '..\..\LoggerPro.VCLListBoxAppender.pas',
+  LoggerPro.VCLListViewAppender in '..\..\LoggerPro.VCLListViewAppender.pas',
+  LoggerPro.VCLMemoAppender in '..\..\LoggerPro.VCLMemoAppender.pas';
 
 end.
+

lib/loggerpro/packages/d130/loggerproRT.dproj

@@ -147,3 +147,4 @@ end.
 
 
 
+

packages/d130/dmvcframeworkRT.dpk

@@ -219,6 +219,10 @@
         <DCCReference Include="..\..\sources\MVCFramework.WebSocket.Server.pas"/>
         <DCCReference Include="..\..\sources\MVCFramework.Middleware.RateLimit.pas"/>
         <DCCReference Include="..\..\sources\TemplatePro.Types.pas"/>
+        <DCCReference Include="..\..\sources\MVCFramework.Validation.pas"/>
+        <DCCReference Include="..\..\sources\MVCFramework.ValidationEngine.pas"/>
+        <DCCReference Include="..\..\sources\MVCFramework.Validators.pas"/>
+        <DCCReference Include="..\..\sources\MVCFramework.Validators.CrossField.pas"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>

packages/d130/dmvcframeworkRT.dproj

@@ -122,13 +122,7 @@ procedure InitThreadVars;
 implementation
 
 uses
-  {$IF Defined(MSWINDOWS)}
   LoggerPro.ConsoleAppender,
-  {$ELSE}
-  {$IF Defined(CONSOLE) and Not Defined(MOBILE)}
-  LoggerPro.SimpleConsoleAppender, //only for linux
-  {$ENDIF}
-  {$ENDIF}
   LoggerPro.Renderers,
   System.IOUtils,
   MVCFramework.Serializer.JsonDataObjects,
@@ -413,11 +407,7 @@ function CreateLoggerWithDefaultConfiguration: ILogWriter;
 
   if IsConsole and UseConsoleLogger then
   begin
-    {$IF Defined(MSWINDOWS)}
     lBuilder.WriteToConsole.WithRenderer(TLogItemRendererNoTag.Create).Done;
-    {$ELSEIF Defined(CONSOLE) and Not Defined(MOBILE)}
-    lBuilder.WriteToSimpleConsole.WithRenderer(TLogItemRendererNoTag.Create).Done;
-    {$ENDIF}
   end;
 
   Result := lBuilder.Build;