|
@@ -66,6 +66,9 @@ class HttpServerSettelement
|
|
|
if ($serv->worker_id == 0) {
|
|
if ($serv->worker_id == 0) {
|
|
|
\Swoole\Timer::tick(60000, function () {
|
|
\Swoole\Timer::tick(60000, function () {
|
|
|
$this->logRunStatus();
|
|
$this->logRunStatus();
|
|
|
|
|
+ if ($this->httpserver->taskWorkingNum->get() > 1) {
|
|
|
|
|
+ $this->httpserver->taskWorkingNum->sub();
|
|
|
|
|
+ }
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -74,8 +77,8 @@ class HttpServerSettelement
|
|
|
|
|
|
|
|
private function logRunStatus()
|
|
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) {
|
|
if ($this->httpserver->taskWorkingNum->get() > 0) {
|
|
|
- $data = Response::generate('', 9, '', '还有未完成任务请稍等...');
|
|
|
|
|
|
|
+ $data = Response::generate('', 9, '', '还有未完成任务请稍等...' . $this->httpserver->taskWorkingNum->get());
|
|
|
$response->end($data);
|
|
$response->end($data);
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
@@ -188,13 +191,10 @@ class HttpServerSettelement
|
|
|
unset($logic_obj, $noticeModel, $AdapterObj, $result, $moneySimples, $matchs_1, $matchs_2, $RefClass);
|
|
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 ');
|
|
$data = Response::generate('', 1, ['cost' => (microtime(true) - $request->server['request_time_float'])], 'succes ');
|
|
|
$response->end($data);
|
|
$response->end($data);
|
|
|
- return;
|
|
|
|
|
-
|
|
|
|
|
} catch (\Exception $e) {
|
|
} catch (\Exception $e) {
|
|
|
unset($logic_obj);
|
|
unset($logic_obj);
|
|
|
$data = Response::generate('', 10, '', $e->getMessage() . '--' . $e->getFile() . '--' . $e->getLine());
|
|
$data = Response::generate('', 10, '', $e->getMessage() . '--' . $e->getFile() . '--' . $e->getLine());
|
|
|
$response->end($data);
|
|
$response->end($data);
|
|
|
- return;
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
$this->httpserver->taskWorkingNum->sub();
|
|
$this->httpserver->taskWorkingNum->sub();
|