0b2/catchAdmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复worker等待状态bug

Browse Source
This commit is contained in:
JaguarJack 2020-07-09 08:37:03 +08:00
parent ea32a4cd33
commit 104ad3f744
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
extend/catcher/library/crontab/ManageProcess.php
View File

@ -129,7 +129,6 @@ class ManageProcess
// 向 process 投递 cron
// var_dump(serialize($cron));
//$process->push(serialize($cron));
var_dump($process->pop());
} else {
// 创建临时 process 处理，处理完自动销毁
$this->createProcess($cron);
@ -183,6 +182,8 @@ class ManageProcess
*/
protected function initProcesses()
{
file_put_contents($this->getProcessStatusPath(), '');
for ($i = 0; $i < $this->staticNum; $i++) {
$process = $this->createStaticProcess();

2
extend/catcher/library/crontab/Process.php
View File

@ -94,12 +94,14 @@ trait Process
// 获取等待状态的 worker
$processes = $this->getProcessesStatus();
// $processIds
foreach ($processes as $process) {
if ($process['status'] == self::WAITING) {
$pid = $process['pid'];
break;
}
}
// 获取相应的状态
if (isset($this->processes[$pid])) {
return [true, $this->processes[$pid]];

8
extend/catcher/library/crontab/Store.php
View File

@ -35,9 +35,11 @@ trait Store
*/
public function storeStatus(array $status)
{
if (file_exists($this->getProcessStatusPath())) {
$workersStatus = $this->getProcessesStatus();
$workersStatus = $this->getProcessesStatus();
if (empty($workersStatus)) {
$this->writeStatusToFile([$status]);
} else {
// ['PID',, 'START_AT', 'STATUS', 'DEAL_TASKS', 'ERRORS', 'running_time', 'memory'];
$pids = array_column($workersStatus, 'pid');
@ -52,8 +54,6 @@ trait Store
}
}
$this->writeStatusToFile($workersStatus);
} else {
file_put_contents($this->getProcessStatusPath(), \json_encode([$status]));
}
}