[httpServer] added more debug info

Author: exilon

Quick.HttpServer.Request.pas

@@ -1,13 +1,13 @@
 { ***************************************************************************
 
-  Copyright (c) 2016-2019 Kike Pérez
+  Copyright (c) 2016-2021 Kike Pérez
 
   Unit        : Quick.HttpServer.Request
   Description : Http Server Request
   Author      : Kike Pérez
   Version     : 1.8
   Created     : 30/08/2019
-  Modified    : 31/08/2019
+  Modified    : 07/02/2021
 
   This file is part of QuickLib: https://github.com/exilon/QuickLib
 
@@ -34,6 +34,9 @@
 interface
 
 uses
+  {$IFDEF DEBUG_HTTPSERVER}
+  Quick.Debug.Utils,
+  {$ENDIF}
   Classes,
   SysUtils,
   Quick.Commons,
@@ -143,6 +146,9 @@ implementation
 
 function THttpRequest.ContentAsString: string;
 begin
+  {$IFDEF DEBUG_HTTPSERVER}
+  TDebugger.Trace(Self,'ContentAsString Encode: %s',[ContentEncoding]);
+  {$ENDIF}
   if fContent <> nil then Result := StreamToString(fContent,TEncoding.UTF8);
 end;
 

Quick.HttpServer.pas

@@ -74,13 +74,15 @@   TCustomErrorPages = class
     function GetOnRequest : TRequestEvent;
     function GetCustomErrorPages: TCustomErrorPages;
     procedure SetCustomErrorPages(const Value: TCustomErrorPages);
+    function GetLogger : ILogger;
+    procedure SetLogger(const aLogger : ILogger);
     function GetHost: string;
     function GetPort: Integer;
     property OnNewRequest : TRequestEvent read GetOnRequest write SetOnRequest;
     property CustomErrorPages : TCustomErrorPages read GetCustomErrorPages write SetCustomErrorPages;
     property Host : string read GetHost;
     property Port : Integer read GetPort;
-    function Logger : ILogger;
+    property Logger : ILogger read GetLogger write SetLogger;
     procedure Start;
     procedure Stop;
   end;
@@ -95,6 +97,8 @@   TCustomHttpServer = class(TInterfacedObject,IHttpServer)
     function GetOnRequest : TRequestEvent;
     function GetCustomErrorPages: TCustomErrorPages;
     procedure SetCustomErrorPages(const Value: TCustomErrorPages);
+    function GetLogger : ILogger;
+    procedure SetLogger(const aLogger : ILogger);
     function GetHost: string;
     function GetPort: Integer;
   protected
@@ -112,7 +116,7 @@   TCustomHttpServer = class(TInterfacedObject,IHttpServer)
     property OnNewRequest : TRequestEvent read GetOnRequest write SetOnRequest;
     property OnConnect : TOnConnectEvent read fOnConnect write fOnConnect;
     property OnDisconnect : TOnDisconnectEvent read fOnDisconnect write fOnDisconnect;
-    function Logger : ILogger;
+    property Logger : ILogger read GetLogger write SetLogger;
     procedure Start; virtual; abstract;
     procedure Stop; virtual; abstract;
   end;
@@ -237,6 +241,11 @@ function TCustomHttpServer.GetHost: string;
   Result := fHost;
 end;
 
+function TCustomHttpServer.GetLogger: ILogger;
+begin
+  Result := fLogger;
+end;
+
 function TCustomHttpServer.GetOnRequest: TRequestEvent;
 begin
   Result := fOnRequest;
@@ -252,14 +261,14 @@ procedure TCustomHttpServer.SetCustomErrorPages(const Value: TCustomErrorPages);
   fCustomErrorPages := Value;
 end;
 
-procedure TCustomHttpServer.SetOnRequest(aRequestEvent: TRequestEvent);
+procedure TCustomHttpServer.SetLogger(const aLogger: ILogger);
 begin
-  fOnRequest := aRequestEvent;
+  fLogger := aLogger;
 end;
 
-function TCustomHttpServer.Logger: ILogger;
+procedure TCustomHttpServer.SetOnRequest(aRequestEvent: TRequestEvent);
 begin
-  Result := fLogger;
+  fOnRequest := aRequestEvent;
 end;
 
 { THTTPServer }
@@ -335,6 +344,9 @@ function THttpServer.GetRequestInfo(aRequestInfo: TIdHTTPRequestInfo): THttpRequ
   Result.ContentType := aRequestInfo.ContentType;
   Result.ContentEncoding := aRequestInfo.ContentEncoding;
   Result.ContentLength := aRequestInfo.ContentLength;
+  {$IFDEF DEBUG_HTTPSERVER}
+  TDebugger.Trace(Self,'Request: Headers (%s)',[aRequestInfo.RawHeaders.Text]);
+  {$ENDIF}
   for i := 0 to aRequestInfo.RawHeaders.Count -1 do
   begin
     if not StrInArray(aRequestInfo.RawHeaders.Names[i],['Host','Accept-Encoding','Accept','User-Agent','Connection','Cache-Control']) then
@@ -407,7 +419,11 @@ procedure THTTPServer.OnGetRequest(aContext: TIdContext; aRequestInfo: TIdHTTPRe
     on E : Exception do
     begin
       //get unexpected exception
-      if E.InheritsFrom(EControlledException) then response.ContentText := response.ContentText + '<BR>' + e.Message
+      if E.InheritsFrom(EControlledException) then
+      begin
+        Logger.Error('Request: %s %s [%d %s] %s',[request.GetMethodAsString,request.URL, response.StatusCode, response.StatusText,e.Message]);
+        response.ContentText := response.ContentText + '<BR>' + e.Message;
+      end
       else
       begin
         if response.StatusCode = 200 then
@@ -416,6 +432,9 @@ procedure THTTPServer.OnGetRequest(aContext: TIdContext; aRequestInfo: TIdHTTPRe
           response.StatusText := 'Internal server error';
         end;
         response.ContentText := e.Message;
+        //log error
+        if response.StatusCode = 404 then Logger.Warn('Request: %s %s [%d %s] %s',[request.GetMethodAsString,request.URL, response.StatusCode, response.StatusText,e.Message])
+          else Logger.Error('Request: %s %s [%d %s] %s',[request.GetMethodAsString,request.URL, response.StatusCode, response.StatusText,e.Message]);
       end;
     end;
   end;