master: Fix log

Author: Pavel

src/Exceptions/JsonRpcHandler.php

@@ -10,7 +10,7 @@
 
 class JsonRpcHandler
 {
-    protected const EXCEPTION_MESSAGE = 'JsonRpc (%s): #%d %s';
+    protected const EXCEPTION_MESSAGE = 'JsonRpc (method:"%s", id:"%s", service:"%s"): #%d %s';
 
     public function handle(\Exception $e)
     {
@@ -35,8 +35,15 @@ public function handle(\Exception $e)
         /** @var JsonRpcRequest $request */
         $request = app(JsonRpcRequest::class);
 
-        Log::channel(config('jsonrpc.logChannel', 'default'))
-            ->info(sprintf(self::EXCEPTION_MESSAGE, $request->id, $error->code, $error->message));
+        $logContext = [
+            'method' => $request->call->method,
+            'call' => class_basename($request->controller) . '::' . $request->method,
+            'id' => $request->id,
+            'service' => $request->service,
+        ];
+
+        Log::channel(config('jsonrpc.log.channel', 'default'))
+            ->info('Error #' . $error->code . ': ' . $error->message, $logContext);
 
         $handler = app(ExceptionHandler::class);
         $handler->report($e);

src/JsonRpcRequest.php

@@ -9,9 +9,6 @@
 
 class JsonRpcRequest
 {
-    protected const REQUEST_MESSAGE = 'JsonRpc (%s): New request (%s/%s)';
-    protected const RESPONSE_MESSAGE = 'JsonRpc (%s): Successful request (%s/%s)';
-
     public $call;
 
     public $id;
@@ -48,14 +45,20 @@ public function handle()
             throw new JsonRpcException(JsonRpcException::CODE_INTERNAL_ERROR);
         }
 
-        Log::channel(config('jsonrpc.logChannel', 'default'))
-            ->info(sprintf(self::REQUEST_MESSAGE, $this->id, class_basename($this->controller), $this->method),
-                ArrayHelper::fromObject($this->call));
+        $logContext = [
+            'method' => $this->call->method,
+            'call' => class_basename($this->controller) . '::' . $this->method,
+            'id' => $this->id,
+            'service' => $this->service,
+        ];
+
+        Log::channel(config('jsonrpc.log.channel', 'default'))
+            ->info('New request', $logContext + ['request' => ArrayHelper::fromObject($this->call)]);
 
         $result = $this->controller->{$this->method}(...$this->params);
 
-        Log::channel(config('jsonrpc.logChannel', 'default'))
-            ->info(sprintf(self::RESPONSE_MESSAGE, $this->id, class_basename($this->controller), $this->method));
+        Log::channel(config('jsonrpc.log.channel', 'default'))
+            ->info('Successful request', $logContext);
 
         return $result;
     }