Corrigido Dados do Logger

dliocode · Jan 16, 2023 · 44a9616 · 44a9616
1 parent e95c7e9
commit 44a9616
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 35 deletions.
diff --git a/DataLogger.dpk b/DataLogger.dpk
@@ -25,6 +25,8 @@ package DataLogger;
 {$IMAGEBASE $400000}
 {$DEFINE RELEASE}
 {$ENDIF IMPLICITBUILDING}
+{$DESCRIPTION 'DataLogger'}
+{$RUNONLY}
 {$IMPLICITBUILD ON}
 
 requires
@@ -97,6 +99,7 @@ contains
   DataLogger.Provider.Socket in 'src\Providers\DataLogger.Provider.Socket.pas',
   DataLogger.Provider.Splunk in 'src\Providers\DataLogger.Provider.Splunk.pas',
   DataLogger.Provider.SumoLogic in 'src\Providers\DataLogger.Provider.SumoLogic.pas',
+  DataLogger.Provider.SysLog.Indy in 'src\Providers\DataLogger.Provider.SysLog.Indy.pas',
   DataLogger.Provider.SysLog in 'src\Providers\DataLogger.Provider.SysLog.pas',
   DataLogger.Provider.Telegram in 'src\Providers\DataLogger.Provider.Telegram.pas',
   DataLogger.Provider.TextFile in 'src\Providers\DataLogger.Provider.TextFile.pas',

diff --git a/src/Core/DataLogger.Provider.pas b/src/Core/DataLogger.Provider.pas
@@ -74,6 +74,17 @@   TDataLoggerProvider<T: class> = class(TDataLoggerProviderBase)
 
     FLiveMode: Boolean;
 
+    FAppName: string;
+    FAppPath: string;
+    FAppVersion: TLoggerUtils.TAppVersion;
+    FAppSize: Double;
+    FComputerName: string;
+    FUsername: string;
+    FOSVersion: string;
+    FProcessID: string;
+    FIPLocal: string;
+    FMACAddress: string;
+
     function ExtractCache(const AUseLock: Boolean = True): TArray<TLoggerItem>;
     procedure Start;
   protected
@@ -531,18 +542,6 @@ function TDataLoggerProvider<T>.AddCache(const AValues: TArray<TLoggerItem>): T;
   I: Integer;
   LItem: TLoggerItem;
 
-  LAppName: string;
-  LAppPath: string;
-  LAppVersion: TLoggerUtils.TAppVersion;
-  LAppSize: Double;
-
-  LComputerName: string;
-  LUsername: string;
-  LOSVersion: string;
-  LProcessID: string;
-  LIPLocal: string;
-  LMACAddress: string;
-
   LMessage: string;
   LTransaction: TDataLoggerTransaction;
   LListLoggerItem: TDataLoggerListItem;
@@ -553,17 +552,16 @@ function TDataLoggerProvider<T>.AddCache(const AValues: TArray<TLoggerItem>): T;
   begin
     FLastCheckInfo := Now;
 
-    LAppName := TLoggerUtils.AppName;
-    LAppPath := TLoggerUtils.AppPath;
-    LAppVersion := TLoggerUtils.AppVersion;
-    LAppSize := TLoggerUtils.AppSize;
-
-    LComputerName := TLoggerUtils.ComputerName;
-    LUsername := TLoggerUtils.Username;
-    LOSVersion := TLoggerUtils.OS;
-    LProcessID := TLoggerUtils.ProcessID;
-    LIPLocal := TLoggerUtils.IPLocal;
-    LMACAddress := TLoggerUtils.MACAddress;
+    FAppName := TLoggerUtils.AppName;
+    FAppPath := TLoggerUtils.AppPath;
+    FAppVersion := TLoggerUtils.AppVersion;
+    FAppSize := TLoggerUtils.AppSize;
+    FComputerName := TLoggerUtils.ComputerName;
+    FUsername := TLoggerUtils.Username;
+    FOSVersion := TLoggerUtils.OS;
+    FProcessID := TLoggerUtils.ProcessID;
+    FIPLocal := TLoggerUtils.IPLocal;
+    FMACAddress := TLoggerUtils.MACAddress;
   end;
 
   Lock;
@@ -575,18 +573,16 @@ function TDataLoggerProvider<T>.AddCache(const AValues: TArray<TLoggerItem>): T;
 
         LItem.TimeStampISO8601 := DateToISO8601(LItem.TimeStamp, False);
         LItem.TimeStampUNIX := DateTimeToUnix(LItem.TimeStamp, False);
-
-        LItem.AppName := LAppName;
-        LItem.AppPath := LAppPath;
-        LItem.AppVersion := LAppVersion;
-        LItem.AppSize := LAppSize;
-
-        LItem.ComputerName := LComputerName;
-        LItem.Username := LUsername;
-        LItem.OSVersion := LOSVersion;
-        LItem.ProcessID := LProcessID;
-        LItem.IPLocal := LIPLocal;
-        LItem.MACAddress := LMACAddress;
+        LItem.AppName := FAppName;
+        LItem.AppPath := FAppPath;
+        LItem.AppVersion := FAppVersion;
+        LItem.AppSize := FAppSize;
+        LItem.ComputerName := FComputerName;
+        LItem.Username := FUsername;
+        LItem.OSVersion := FOSVersion;
+        LItem.ProcessID := FProcessID;
+        LItem.IPLocal := FIPLocal;
+        LItem.MACAddress := FMACAddress;
 
         if not LItem.InternalItem.IsSlinebreak then
         begin