fix: swoft-cloud/swoft/issues/1303 rpc ext data key is error

swoft-cloud · Jun 16, 2020 · 15bad43 · 15bad43
1 parent 0700226
commit 15bad43
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 13 deletions.
diff --git a/src/rpc-client/src/Concern/ServiceTrait.php b/src/rpc-client/src/Concern/ServiceTrait.php
@@ -120,7 +120,6 @@ private function sendAndRecv(Connection $connection, string $data, string $messa
         if (!$connection->send($data)) {
             if ($reconnect) {
                 $message = sprintf($message, $connection->getErrCode(), $connection->getErrMsg());
-                $connection->release();
                 throw new RpcClientException($message);
             }
 
@@ -129,10 +128,9 @@ private function sendAndRecv(Connection $connection, string $data, string $messa
 
         $result = $connection->recv();
         if ($result === false || empty($result)) {
-            //Reconnected or receive date timeout
+            // Has been reconnected OR receive date timeout
             if ($reconnect || $connection->getErrCode() === SOCKET_ETIMEDOUT) {
                 $message = sprintf($message, $connection->getErrCode(), $connection->getErrMsg());
-                $connection->release();
                 throw new RpcClientException($message);
             }
 

diff --git a/src/rpc-client/src/Connection.php b/src/rpc-client/src/Connection.php
@@ -144,17 +144,17 @@ public function recv()
     /**
      * @return int
      */
-    public function getErrCode()
+    public function getErrCode(): int
     {
-        return $this->connection->errCode;
+        return (int)$this->connection->errCode;
     }
 
     /**
      * @return string
      */
-    public function getErrMsg()
+    public function getErrMsg(): string
     {
-        return $this->connection->errMsg;
+        return (string)$this->connection->errMsg;
     }
 
     /**
@@ -177,7 +177,7 @@ private function getHostPort(): array
             throw new RpcClientException(sprintf('Provider(%s) return format is error!', JsonHelper::encode($list)));
         }
 
-        $randKey = array_rand($list, 1);
+        $randKey  = array_rand($list, 1);
         $hostPort = explode(':', $list[$randKey]);
 
         if (count($hostPort) < 2) {

diff --git a/src/rpc-client/src/Extender.php b/src/rpc-client/src/Extender.php
@@ -29,10 +29,10 @@ class Extender implements ExtenderInterface
     public function getExt(): array
     {
         return [
-            context()->get('traceid', ''),
-            context()->get('spanid', ''),
-            context()->get('parentid', ''),
-            context()->get('extra', null),
+            'traceid'  => context()->get('traceid', ''),
+            'spanid'   => context()->get('spanid', ''),
+            'parentid' => context()->get('parentid', ''),
+            'extra'    => context()->get('extra', null),
         ];
     }
 }
diff --git a/src/rpc-client/src/ReferenceRegister.php b/src/rpc-client/src/ReferenceRegister.php
@@ -68,7 +68,7 @@ public static function getPool(string $className): string
     public static function getVersion(string $className): string
     {
         $version = self::$references[$className]['version'] ?? '';
-        if ($version == '') {
+        if ($version === '') {
             throw new RpcClientException(sprintf('`@Reference` version(%s) is not exist!', $className));
         }