Commit cf96f894 by Michael Brachmann

more logging to debug websocket

parent f6babd1d
...@@ -15,11 +15,12 @@ type ...@@ -15,11 +15,12 @@ type
TLoggingMiddleware = class(THttpServerMiddleware, IHttpServerMiddleware) TLoggingMiddleware = class(THttpServerMiddleware, IHttpServerMiddleware)
private private
FLogger: ILogger; FLogger: ILogger;
FLogLevel: Integer;
function GetNewHttpRequestLog(Request: THttpServerRequest): ILog; function GetNewHttpRequestLog(Request: THttpServerRequest): ILog;
protected protected
procedure ProcessRequest(Context: THttpServerContext; Next: THttpServerProc); override; procedure ProcessRequest(Context: THttpServerContext; Next: THttpServerProc); override;
public public
constructor Create(ALogger: ILogger); constructor Create(ALogger: ILogger; ALogLevel: Integer = 5);
end; end;
THttpRequestLog = class( TInterfacedObject, ILog ) THttpRequestLog = class( TInterfacedObject, ILog )
...@@ -60,9 +61,10 @@ implementation ...@@ -60,9 +61,10 @@ implementation
{ TLoggingMiddleware } { TLoggingMiddleware }
constructor TLoggingMiddleware.Create(ALogger: ILogger); constructor TLoggingMiddleware.Create(ALogger: ILogger; ALogLevel: Integer = 5);
begin begin
FLogger := TLogger.Create(ALogger); FLogger := TLogger.Create(ALogger);
FLogLevel := ALogLevel;
end; end;
function TLoggingMiddleware.GetNewHttpRequestLog( function TLoggingMiddleware.GetNewHttpRequestLog(
...@@ -116,11 +118,11 @@ begin ...@@ -116,11 +118,11 @@ begin
procedure(Resp: THttpServerResponse) procedure(Resp: THttpServerResponse)
begin begin
if (Resp.StatusCode >= 400) and (Resp.StatusCode <= 499) then if (Resp.StatusCode >= 400) and (Resp.StatusCode <= 499) then
FLogger.Log(5, Format('%d %s on %s', [Resp.StatusCode, Resp.StatusReason, RequestLogMessage])); FLogger.Log(FLogLevel, Format('%d %s on %s', [Resp.StatusCode, Resp.StatusReason, RequestLogMessage]));
end end
); );
RequestLogMessage := GetNewHttpRequestLog(Context.Request).GetMessage; RequestLogMessage := GetNewHttpRequestLog(Context.Request).GetMessage;
FLogger.Log(5, RequestLogMessage); FLogger.Log(FLogLevel, RequestLogMessage);
Next(Context); Next(Context);
end; end;
......
...@@ -19,6 +19,10 @@ object WsServerModule: TWsServerModule ...@@ -19,6 +19,10 @@ object WsServerModule: TWsServerModule
object XDataServer1Logging: TSparkleGenericMiddleware object XDataServer1Logging: TSparkleGenericMiddleware
OnMiddlewareCreate = XDataServer1LoggingMiddlewareCreate OnMiddlewareCreate = XDataServer1LoggingMiddlewareCreate
end end
object XDataServer1WebSocket: TSparkleWebSocketMiddleware
AllowedOrigins.Strings = (
'*')
end
object XDataServer1CORS: TSparkleCorsMiddleware object XDataServer1CORS: TSparkleCorsMiddleware
end end
object XDataServer1Compress: TSparkleCompressMiddleware object XDataServer1Compress: TSparkleCompressMiddleware
...@@ -26,9 +30,5 @@ object WsServerModule: TWsServerModule ...@@ -26,9 +30,5 @@ object WsServerModule: TWsServerModule
object XDataServer1JWT: TSparkleJwtMiddleware object XDataServer1JWT: TSparkleJwtMiddleware
OnGetSecret = XDataServer1JWTGetSecret OnGetSecret = XDataServer1JWTGetSecret
end end
object XDataServer1WebSocket: TSparkleWebSocketMiddleware
AllowedOrigins.Strings = (
'*')
end
end end
end end
...@@ -83,7 +83,7 @@ end; ...@@ -83,7 +83,7 @@ end;
procedure TWsServerModule.XDataServer1LoggingMiddlewareCreate(Sender: TObject; procedure TWsServerModule.XDataServer1LoggingMiddlewareCreate(Sender: TObject;
var Middleware: IHttpServerMiddleware); var Middleware: IHttpServerMiddleware);
begin begin
Middleware := TLoggingMiddleware.Create(Logger); Middleware := TLoggingMiddleware.Create(Logger, 1);
end; end;
procedure TWsServerModule.XDataServer1JWTGetSecret(Sender: TObject; procedure TWsServerModule.XDataServer1JWTGetSecret(Sender: TObject;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment