全局回调出错不应该影响业务逻辑回调

easy-swoole · Nov 6, 2020 · d8f949b · d8f949b
1 parent 91f66a8
commit d8f949b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/src/RpcClient.php b/src/RpcClient.php
@@ -107,13 +107,17 @@ private function callback(Response $response, ServiceCall $serviceCall)
             $globalCall = $this->clientConfig->getOnGlobalFail();
             $call = $serviceCall->getOnFail();
         }
-
-        if (is_callable($globalCall)) {
-            call_user_func($globalCall, $response, $serviceCall);
-        }
-
-        if (is_callable($call)) {
-            call_user_func($call, $response, $serviceCall);
+        //全局回调出错不应该影响业务逻辑回调
+        try{
+            if (is_callable($globalCall)) {
+                call_user_func($globalCall, $response, $serviceCall);
+            }
+        }catch (\Throwable $throwable){
+            throw $throwable;
+        } finally {
+            if (is_callable($call)) {
+                call_user_func($call, $response, $serviceCall);
+            }
         }
     }
 }
diff --git a/src/TcpClient.php b/src/TcpClient.php
@@ -38,7 +38,7 @@ function recv(float $timeout = 3.0):Response
                 }else{
                     return new Response([
                         'status'=>Response::STATUS_SERVICE_ERROR,
-                        'message'=>$data
+                        'msg'=>$data
                     ]);
                 }
             }else{