tars-client problem fix; exclude fpm from using swoole; fix problem o…

…f tars server 修复tars-client的问题，在fpm的情况下禁止使用swoole table，修复tars-server的iReuqestId问题
linghunjiushu · Sep 1, 2018 · 1dc4ede · 1dc4ede
1 parent 83400be
commit 1dc4ede
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/php/tars-client/src/TUPAPIWrapper.php b/php/tars-client/src/TUPAPIWrapper.php
@@ -452,7 +452,7 @@ public static function putMap($paramName, $tag, $map, $iVersion)
         }
     }
 
-    public function getMap($name, $tag, $obj, $sBuffer, $iVersion)
+    public static function getMap($name, $tag, $obj, $sBuffer, $iVersion)
     {
         try {
             if ($iVersion === Consts::TARSVERSION) {

diff --git a/php/tars-registry/src/QueryFWrapper.php b/php/tars-registry/src/QueryFWrapper.php
@@ -52,7 +52,7 @@ public function findObjectById($id)
 
             // 这里你能起一个定时器么,i think not, 但是可以起swooletable
             // 然后在server里面轮询,再去刷swooletable里面缓存的数据
-            if (class_exists('swoole_table')) {
+            if (class_exists('swoole_table') && php_sapi_name() !== "apache" && php_sapi_name() !== "fpm-fcgi") {
                 RouteTable::getInstance();
                 RouteTable::setRouteInfo($id, $routeInfo);
             }

diff --git a/php/tars-server/src/protocol/TARSProtocol.php b/php/tars-server/src/protocol/TARSProtocol.php
@@ -179,7 +179,6 @@ public function packRsp($paramInfo, $unpackResult, $args, $returnVal)
                 // 完成所有的打包之后,开始编码
                 $cPacketType = 0;
                 $iMessageType = 0;
-                $iRequestId = 1; // 使用协程的id
                 $statuses = [];
 
                 $servantName = $unpackResult['sServantName'];
-Original file line number
+Diff line change
@@ Expand Up @@
             }
         }
-        public function getMap($name, $tag, $obj, $sBuffer, $iVersion)
+        public static function getMap($name, $tag, $obj, $sBuffer, $iVersion)
         {
             try {
                 if ($iVersion === Consts::TARSVERSION) {
@@ Expand Down @@