Merge pull request #1637 from visuddhinanda/laravel

webhook 添加 log 详细信息 url

app/Console/Commands/MqDiscussion.php

@@ -11,6 +11,7 @@ use App\Http\Api\Mq;
 use App\Tools\WebHook as WebHookSend;
 use App\Http\Api\MdRender;
 use App\Http\Api\UserApi;
+use Illuminate\Support\Facades\Log;
 
 class MqDiscussion extends Command
 {
@@ -121,7 +122,13 @@ class MqDiscussion extends Command
                                 break;
                         }
                         $result += $ok;
-                        $this->info("{$command}  ok={$ok}");
+                        $logMsg = "{$command}  ok={$ok}";
+                        if($ok === 0){
+                            $this->info($logMsg);
+                        }else{
+                            $this->error($logMsg);
+                        }
+
                         if($ok===0){
                             WebHook::where('id',$hook->id)->increment('success');
                         }else{

app/Tools/WebHook.php

@@ -45,16 +45,25 @@ class WebHook{
     }
 
     private function send($url, $param){
-        Log::info('webhook send ',$param);
         try{
             $response = Http::post($url, $param);
+            $logResponse = [
+                'status'=>$response->status(),
+                'headers'=>$response->headers(),
+                'body'=>$response->body(),
+            ];
             if($response->successful()){
+                Log::info('webhook send to:{url} message:{message} response:{response} ',
+                        ['url'=>$url,'message'=>$param,'response'=>$logResponse]);
                 return 0;
             }else{
+                Log::error('webhook send to:{url} message:{message} ',
+                            ['url'=>$url,'message'=>$param,'response'=>$logResponse]);
                 return 1;
             }
         }catch(\Exception $e){
-            Log::error('webhook send fail',$e);
+            Log::error('webhook send to:{url} message:{message} error:{error} ',
+                        ['url'=>$url,'message'=>$param,$error=>$e]);
             return 1;
         }
         return 0;