vali 6 năm trước cách đây
mục cha
commit
abfc309402

+ 4 - 1
datainf/logic/HttpServerDataInf.php

@@ -50,6 +50,9 @@ class HttpServerDataInf
         if ($serv->worker_id == 0) {
             \Swoole\Timer::tick(60000, function () {
                 $this->logRunStatus();
+                if ($this->httpserver->taskWorkingNum->get() > 1) {
+                    $this->httpserver->taskWorkingNum->sub();
+                }
             });
         }
 
@@ -58,7 +61,7 @@ class HttpServerDataInf
     private function logRunStatus()
     {
         echo date('Y-m-d H:i:s') . " 总请求数:" . $this->httpserver->account->get() . '  运行任务数:' . $this->httpserver->taskWorkingNum->get();
-        echo $this->httpserver->worker_id . " 内存使用量:" . (memory_get_usage() / 1000) . 'k  峰值:' . (memory_get_peak_usage() / 1000) . "k\n";
+        echo ' work_id:' . $this->httpserver->worker_id . " 内存使用量:" . (memory_get_usage() / 1000) . 'k  峰值:' . (memory_get_peak_usage() / 1000) . "k\n";
     }
 
 

+ 1 - 1
datainf/logic/HttpServerOnlySet.php

@@ -73,7 +73,7 @@ class HttpServerOnlySet
     private function logRunStatus()
     {
         echo date('Y-m-d H:i:s') . " 总请求数:" . $this->httpserver->account->get() . '  运行任务数:' . $this->httpserver->taskWorkingNum->get();
-        echo $this->httpserver->worker_id . " 内存使用量:" . (memory_get_usage() / 1000) . 'k  峰值:' . (memory_get_peak_usage() / 1000) . "k\n";
+        echo ' work_id:' . $this->httpserver->worker_id . " 内存使用量:" . (memory_get_usage() / 1000) . 'k  峰值:' . (memory_get_peak_usage() / 1000) . "k\n";
     }
 
 

+ 1 - 1
datainf/logic/HttpServerRedisToSql.php

@@ -63,7 +63,7 @@ class HttpServerRedisToSql
     private function logRunStatus()
     {
         echo date('Y-m-d H:i:s') . " 总请求数:" . $this->httpserver->account->get() . '  运行任务数:' . $this->httpserver->taskWorkingNum->get();
-        echo $this->httpserver->worker_id . " 内存使用量:" . (memory_get_usage() / 1000) . 'k  峰值:' . (memory_get_peak_usage() / 1000) . "k\n";
+        echo ' work_id:' . $this->httpserver->worker_id . " 内存使用量:" . (memory_get_usage() / 1000) . 'k  峰值:' . (memory_get_peak_usage() / 1000) . "k\n";
     }
 
 

+ 6 - 6
datainf/logic/HttpServerSettelement.php

@@ -66,6 +66,9 @@ class HttpServerSettelement
         if ($serv->worker_id == 0) {
             \Swoole\Timer::tick(60000, function () {
                 $this->logRunStatus();
+                if ($this->httpserver->taskWorkingNum->get() > 1) {
+                    $this->httpserver->taskWorkingNum->sub();
+                }
             });
         }
 
@@ -74,8 +77,8 @@ class HttpServerSettelement
 
     private function logRunStatus()
     {
-        echo date('Y-m-d H:i:s')." 总请求数:" . $this->httpserver->account->get() . '  运行任务数:' . $this->httpserver->taskWorkingNum->get();
-        echo $this->httpserver->worker_id . " 内存使用量:" . (memory_get_usage() / 1000) . 'k  峰值:' . (memory_get_peak_usage() / 1000) . "k\n";
+        echo date('Y-m-d H:i:s') . " 总请求数:" . $this->httpserver->account->get() . '  运行任务数:' . $this->httpserver->taskWorkingNum->get();
+        echo ' work_id:' . $this->httpserver->worker_id . " 内存使用量:" . (memory_get_usage() / 1000) . 'k  峰值:' . (memory_get_peak_usage() / 1000) . "k\n";
     }
 
 
@@ -100,7 +103,7 @@ class HttpServerSettelement
         }
 
         if ($this->httpserver->taskWorkingNum->get() > 0) {
-            $data = Response::generate('', 9, '', '还有未完成任务请稍等...');
+            $data = Response::generate('', 9, '', '还有未完成任务请稍等...' . $this->httpserver->taskWorkingNum->get());
             $response->end($data);
             return;
         }
@@ -188,13 +191,10 @@ class HttpServerSettelement
             unset($logic_obj, $noticeModel, $AdapterObj, $result, $moneySimples, $matchs_1, $matchs_2, $RefClass);
             $data = Response::generate('', 1, ['cost' => (microtime(true) - $request->server['request_time_float'])], 'succes ');
             $response->end($data);
-            return;
-
         } catch (\Exception $e) {
             unset($logic_obj);
             $data = Response::generate('', 10, '', $e->getMessage() . '--' . $e->getFile() . '--' . $e->getLine());
             $response->end($data);
-            return;
         }
 
         $this->httpserver->taskWorkingNum->sub();