Samples cleaning for DAPUG 2017

danieleteti · Oct 22, 2017 · 279686d · 279686d
1 parent fd0d1de
commit 279686d
Show file tree

Hide file tree

Showing 12 changed files with 984 additions and 415 deletions.
diff --git a/.gitignore b/.gitignore
@@ -63,3 +63,4 @@ __history/
 
 # Castalia statistics file (since XE7 Castalia is distributed with Delphi)
 *.stat
+/samples/08_email_appender/bin/config.txt
diff --git a/samples/05_vcl_appenders/MemoAppendersFormU.pas b/samples/05_vcl_appenders/MemoAppendersFormU.pas
@@ -73,7 +73,7 @@ procedure TMainForm.Button5Click(Sender: TObject);
       lThreadID: String;
     begin
       lThreadID := IntToStr(TThread.Current.ThreadID);
-      for I := 1 to 200 do
+      for I := 1 to 50 do
       begin
         Log.Debug('log message ' + TimeToStr(now) + ' ThreadID: ' + lThreadID,
           'MULTITHREADING');

diff --git a/samples/08_email_appender/LoggerProConfig.pas b/samples/08_email_appender/LoggerProConfig.pas
@@ -13,8 +13,10 @@ implementation
   LoggerPro.FileAppender,
   LoggerPro.EMailAppender,
   LoggerPro.OutputDebugStringAppender,
-  idSMTP,
-  IdIOHandlerStack, IdSSL, IdSSLOpenSSL, IdExplicitTLSClientServerBase;
+  System.SysUtils,
+  idSMTP, System.IOUtils,
+  IdIOHandlerStack, IdSSL,
+  IdSSLOpenSSL, IdExplicitTLSClientServerBase;
 
 var
   _Log: ILogWriter;
@@ -37,10 +39,12 @@ function GetSMTP: TidSMTP;
     end;
     Result.Host := 'smtp.gmail.com';
     Result.Port := 25;
-    Result.UseTLS := TIdUseTLS.utUseExplicitTLS;
+    Result.UseTLS := TIdUseTLS.utUseImplicitTLS;
     Result.AuthType := satDefault;
     Result.Username := 'daniele.teti@gmail.com';
-    Result.Password := '<yourpassword>';
+    if not TFile.Exists('config.txt') then
+      raise Exception.Create('Create a "config.txt" file containing the password');
+    Result.Password := TFile.ReadAllText('config.txt'); // '<yourpassword>';
   except
     Result.Free;
     raise;
@@ -49,11 +53,17 @@ function GetSMTP: TidSMTP;
 
 procedure SetupLogger;
 const
-{$IFDEF DEBUG}
+
+  {$IFDEF DEBUG}
+
   LOG_LEVEL = TLogType.Debug;
-{$ELSE}
+
+  {$ELSE}
+
   LOG_LEVEL = TLogType.Warning;
-{$ENDIF}
+
+  {$ENDIF}
+
 var
   lEmailAppender: ILogAppender;
 begin

diff --git a/samples/08_email_appender/email_appender.dpr b/samples/08_email_appender/email_appender.dpr
@@ -2,7 +2,8 @@ program email_appender;
 
 uses
   Vcl.Forms,
-  MemoAppendersFormU in 'MemoAppendersFormU.pas' {MainForm};
+  MainFormU in 'MainFormU.pas' {MainForm},
+  LoggerProConfig in 'LoggerProConfig.pas';
 
 {$R *.res}
 

diff --git a/samples/08_email_appender/email_appender.dproj b/samples/08_email_appender/email_appender.dproj
diff --git a/samples/15_appenders_with_different_log_levels/LoggerProConfig.pas b/samples/15_appenders_with_different_log_levels/LoggerProConfig.pas
@@ -24,18 +24,18 @@ function Log: ILogWriter;
 
 procedure SetupLogger;
 var
-  lFileAppender, lConsoleAppender, lOutputDebugStringAppender: ILogAppender;
+  lFileAppender, lErrorsFileAppender, lOutputDebugStringAppender: ILogAppender;
 begin
-  lFileAppender := TLoggerProFileAppender.Create;
+  lFileAppender := TLoggerProFileAppender.Create(5, 1000, 'logs');
   lFileAppender.SetLogLevel(TLogType.Info);
 
-  lConsoleAppender := TLoggerProConsoleAppender.Create;
-  lConsoleAppender.SetLogLevel(TLogType.Warning);
+  lErrorsFileAppender := TLoggerProFileAppender.Create(5, 1000, 'logs_errors');
+  lErrorsFileAppender.SetLogLevel(TLogType.Error);
 
   lOutputDebugStringAppender := TLoggerProOutputDebugStringAppender.Create;
   // default TLogType.Debug
 
-  _Log := BuildLogWriter([lFileAppender, lConsoleAppender, lOutputDebugStringAppender]);
+  _Log := BuildLogWriter([lFileAppender, lErrorsFileAppender, lOutputDebugStringAppender]);
 end;
 
 initialization