#102 Правка вывода логов

Author: boffart

Lib/Bitrix24Integration.php

@@ -373,19 +373,19 @@ private function query(string $url, array $data, $needBuildQuery = true): array
                  // Проверяем наличие ошибки:
                  $error_name = $response['error'] ?? '';
              } elseif (in_array($error_name,['wrong_client','NO_AUTH_FOUND'], true)) {
-                 $this->mainLogger->writeError('Fail REST response ' . json_encode($response));
-                 $this->mainLogger->writeError("$error_name: session: ".json_encode($this->SESSION));
+                 $this->mainLogger->writeError($response, 'Fail REST response');
+                 $this->mainLogger->writeError($this->SESSION, "$error_name: session: ");
              } elseif ('QUERY_LIMIT_EXCEEDED' === $error_name) {
                  $this->mainLogger->writeInfo('Too many requests. Sleeping 1s ... ');
                  sleep(1);
                  $response   = $this->execCurl($url, $curlOptions, $status, $headersResponse, $totalTime);
                  $error_name = $response['error'] ?? '';
              }elseif(!empty($response['result_error'])){
-                 $this->mainLogger->writeInfo("RESPONSE-ERROR: ".json_encode($response['result_error']));
+                 $this->mainLogger->writeInfo($response['result_error'], "RESPONSE-ERROR");
              }
 
              if (!empty($error_name)) {
-                $this->mainLogger->writeError('Fail REST response ' . json_encode($response));
+                $this->mainLogger->writeError($response, 'Fail REST response');
             }
         }
         if(isset( $data['cmd'])){
@@ -408,7 +408,7 @@ private function query(string $url, array $data, $needBuildQuery = true): array
                     unset($query['auth']);
                     $queues[$index] = $query;
                 }
-                $this->mainLogger->writeInfo("REQUEST: ".json_encode($queues, JSON_UNESCAPED_UNICODE));
+                $this->mainLogger->writeInfo($queues, 'REQUEST');
                 $result = $response['result']["result"]??[];
                 // Чистым массив перед выводом в лог.
                 if(is_array($result)){
@@ -418,17 +418,13 @@ private function query(string $url, array $data, $needBuildQuery = true): array
                         }
                     }
                 }
-                $this->mainLogger->writeInfo("RESPONSE: ".json_encode($result, JSON_UNESCAPED_UNICODE));
+                $this->mainLogger->writeInfo($result, 'RESPONSE');
             }
         }
         $this->checkErrorInResponse($response, $status);
         $delta = microtime(true) - $startTime;
         if ($delta > 5 || $totalTime > 5) {
-            $this->mainLogger->writeError(
-                "Slow response. PHP time:{$delta}s, cURL time: {$totalTime}, url:{$url}, Data:$q4Dump, Response: " . json_encode(
-                    $response
-                )
-            );
+            $this->mainLogger->writeError($response, "Slow response. PHP time:{$delta}s, cURL time: {$totalTime}, url:{$url}, Data:$q4Dump, Response: ");
         }
 
         $this->mainLogger->rotate();

Lib/Logger.php

@@ -96,17 +96,23 @@ public function rotate(): void
         }
     }
 
-    public function writeError($data): void
+    public function writeError($data, string $header = ''): void
     {
         if ($this->debug) {
-            $this->logger->error($this->getDecodedString($data));
+            if(!empty($header)){
+                $header.= "$header: ";
+            }
+            $this->logger->error($header . $this->getDecodedString($data));
         }
     }
 
-    public function writeInfo($data): void
+    public function writeInfo($data, string $header = ''): void
     {
         if ($this->debug) {
-            $this->logger->info($this->getDecodedString($data));
+            if(!empty($header)){
+                $header.= ": ";
+            }
+            $this->logger->info($header . $this->getDecodedString($data));
         }
     }
 

bin/WorkerBitrix24IntegrationAMI.php

@@ -205,7 +205,7 @@ private function updateSettings():void{
         }
         $this->updateExternalLines();
         $this->b24->updateSettings();
-        $this->logger->writeInfo(['usersSettingsB24'=> $this->b24->usersSettingsB24]);
+        $this->logger->writeInfo($this->b24->usersSettingsB24, 'usersSettingsB24');
 
     }
 
@@ -272,7 +272,7 @@ public function callback($parameters):void{
         }
         $stringData = base64_decode($parameters['AgiData']);
         $data = json_decode($stringData, true);
-        $this->logger->writeInfo($data['action'].': '.$stringData);
+        $this->logger->writeInfo($stringData, $data['action']);
         switch ($data['action']) {
             case 'hangup_chan':
                 $this->actionHangupChan($data);

bin/WorkerBitrix24IntegrationHTTP.php

@@ -143,7 +143,7 @@ public function invokeRest($client): void
      */
     public function invokeRestCheckResponse($response,$tube, $partResponse): void
     {
-        $this->b24->logger->writeInfo("start response $response, $tube");
+        $this->b24->mainLogger->writeInfo([$response, $partResponse],"start response to tube $tube");
         $resFile = ConnectorDb::saveResultInTmpFile($partResponse);
         $this->queueAgent->publish($resFile, $tube);
     }