Fix and logging update

Author: Ang3

README.md

@@ -488,7 +488,12 @@ Upgrades & updates
 
 - Todo: repository class to manage dedicated model.
 
-### v5.1.0 (last stable)
+### v5.1.1 (last stable)
+
+- Fixed method ```findAll```.
+- Updated endpoint logging level to ```debug``` and added client logging with level ```info```
+
+### v5.1.0
 
 - Added method ```findAll```.
 - Fixed empty array result issue.

src/Client.php

@@ -217,7 +217,7 @@ public function findOneBy(string $modelName, $criteria = null, array $options =
      */
     public function findAll(string $modelName, array $options = []): array
     {
-        return (array) $this->call($modelName, self::FIND, null, $options);
+        return $this->findBy($modelName, null, $options);
     }
 
     /**
@@ -271,6 +271,18 @@ public function listFields(string $modelName, array $options = []): array
      */
     public function call(string $name, string $method, array $parameters = [], array $options = [])
     {
+        $loggerContext = [
+            'request_id' => uniqid('xmlrpc-request-', true),
+            'name' => $name,
+            'method' => $method,
+            'parameters' => $parameters,
+            'options' => $options,
+        ];
+
+        if ($this->logger) {
+            $this->logger->info('Calling method {method} from {model}', $loggerContext);
+        }
+
         try {
             $result = $this->objectEndpoint->call('execute_kw', [
                 $this->database,
@@ -280,7 +292,7 @@ public function call(string $name, string $method, array $parameters = [], array
                 $method,
                 $parameters,
                 $this->encoder->encode($options, 'struct'),
-            ]);
+            ], $loggerContext);
 
             /*
              * Added in v5.0.7
@@ -300,17 +312,22 @@ public function call(string $name, string $method, array $parameters = [], array
                     return null !== $value;
                 });
             }
-
-            return $result;
         } catch (RemoteException $e) {
             // Odoo raises an exception if the remote method does not return values (NULL).
             // This part allows to return null when it happens by ignoring the exception.
             if (preg_match('#cannot marshal None unless allow_none is enabled#', $e->getMessage())) {
-                return null;
+                $result = null;
+            } else {
+                throw $e;
             }
+        }
 
-            throw $e;
+        if ($this->logger) {
+            $loggerContext['result'] = is_scalar($result) ? $result : json_encode($result);
+            $this->logger->info('Request result: {result}', $loggerContext);
         }
+
+        return $result;
     }
 
     public function version(): array

src/XmlRpc/Endpoint.php

@@ -44,14 +44,9 @@ public function __toString(): string
      *
      * @return mixed
      */
-    public function call(string $method, array $args = [])
+    public function call(string $method, array $args = [], array $loggerContext = [])
     {
-        $context = [
-            'request_id' => uniqid('xmlrpc-request-', true),
-            'endpoint' => $this->client->path,
-            'method' => $method,
-            'input_data' => $args,
-        ];
+        $loggerContext['endpoint'] = $this->client->path;
 
         foreach ($args as $key => $arg) {
             $args[$key] = $this->encoder->encode($arg);
@@ -60,7 +55,7 @@ public function call(string $method, array $args = [])
         $context['encoded_data'] = $args;
 
         if ($this->logger) {
-            $this->logger->info('XML-RPC request with method "{method}"', $context);
+            $this->logger->debug('XML-RPC request with method "{method}"', $loggerContext);
         }
 
         try {
@@ -79,18 +74,14 @@ public function call(string $method, array $args = [])
             throw RemoteException::createFromXmlResult($faultCode, $response->faultString() ?: 'Unknown error');
         }
 
-        $context = [
-            'request_id' => $context['request_id'],
-        ];
-
         if ($this->logger) {
-            $this->logger->info('XML-RPC response received', $context);
+            $this->logger->debug('XML-RPC response received', $loggerContext);
         }
 
         $data = $this->encoder->decode($response->val);
 
         if ($this->logger) {
-            $this->logger->info('XML-RPC response decoded', array_merge($context, [
+            $this->logger->debug('XML-RPC response decoded', array_merge($loggerContext, [
                 'data_type' => gettype($data),
             ]));
         }
@@ -102,7 +93,7 @@ public function call(string $method, array $args = [])
             ];
 
             if ($this->logger) {
-                $this->logger->info('XML-RPC response error: {message} - Code {code}', array_merge($context, $error));
+                $this->logger->debug('XML-RPC response error: {message} - Code {code}', array_merge($loggerContext, $error));
             }
 
             throw RemoteException::createFromXmlResult($error['code'], $error['message']);