Browse Source

Merge pull request #2268 from visuddhinanda/development

Development
visuddhinanda 1 year ago
parent
commit
9aa38ad6cd
2 changed files with 5 additions and 5 deletions
  1. 4 4
      api-v8/app/Console/Commands/MqAiTranslate.php
  2. 1 1
      api-v8/app/Http/Api/Mq.php

+ 4 - 4
api-v8/app/Console/Commands/MqAiTranslate.php

@@ -52,7 +52,7 @@ class MqAiTranslate extends Command
         $exchange = 'router';
         $exchange = 'router';
         $queue = 'ai_translate';
         $queue = 'ai_translate';
         $this->info(" [*] Waiting for {$queue}. To exit press CTRL+C");
         $this->info(" [*] Waiting for {$queue}. To exit press CTRL+C");
-        Log::debug("mq {$queue} start.");
+        Log::debug("mq worker {$queue} start.");
         Mq::worker($exchange, $queue, function ($message) use ($queue) {
         Mq::worker($exchange, $queue, function ($message) use ($queue) {
             Log::debug('ai translate start', ['message' => $message]);
             Log::debug('ai translate start', ['message' => $message]);
             //写入 model log
             //写入 model log
@@ -173,10 +173,10 @@ class MqAiTranslate extends Command
             ];
             ];
             $response = Http::timeout(10)->withToken($token)->post($url, $data);
             $response = Http::timeout(10)->withToken($token)->post($url, $data);
             if ($response->failed()) {
             if ($response->failed()) {
-                Log::error($queue . ' discussion error', ['data' => $response->json()]);
+                Log::error($queue . ' discussion create topic error', ['data' => $response->json()]);
             } else {
             } else {
-                Log::info($queue . ' discussion topic successful');
                 if (isset($response->json()['data']['id'])) {
                 if (isset($response->json()['data']['id'])) {
+                    Log::info($queue . ' discussion create topic successful');
                     $data['parent'] = $response->json()['data']['id'];
                     $data['parent'] = $response->json()['data']['id'];
                     unset($data['title']);
                     unset($data['title']);
                     $topicChildren = [];
                     $topicChildren = [];
@@ -199,7 +199,7 @@ class MqAiTranslate extends Command
                         }
                         }
                     }
                     }
                 } else {
                 } else {
-                    Log::error($queue . 'discussion response is null');
+                    Log::error($queue . ' discussion create topic response is null');
                 }
                 }
             }
             }
 
 

+ 1 - 1
api-v8/app/Http/Api/Mq.php

@@ -174,7 +174,7 @@ class Mq
                             $GLOBALS[$key] = 1;
                             $GLOBALS[$key] = 1;
                         }
                         }
                         if ($GLOBALS[$key] >= $value) {
                         if ($GLOBALS[$key] >= $value) {
-                            Log::debug('mq exit loop=' . $GLOBALS[$key]);
+                            Log::debug("mq exit queue={$queue} loop=" . $GLOBALS[$key]);
                             $message->getChannel()->basic_cancel($message->getConsumerTag());
                             $message->getChannel()->basic_cancel($message->getConsumerTag());
                         }
                         }
                     }
                     }