diff --git a/app/admin/controller/Queue.php b/app/admin/controller/Queue.php index 14c9dde2b..bb579b1d9 100644 --- a/app/admin/controller/Queue.php +++ b/app/admin/controller/Queue.php @@ -110,9 +110,13 @@ class Queue extends Controller public function start() { try { + // Asynchronous daemons already exist for pid 1680 + // Asynchronous daemons started successfully for pid 15740 $message = nl2br($this->app->console->call('xadmin:queue', ['start'])->fetch()); - if (preg_match('/process.*?\d+/', $message, $attr)) { + if (stripos($message, 'daemons started successfully for pid')) { $this->success('任务监听主进程启动成功!'); + } elseif (stripos($message, 'daemons already exist for pid')) { + $this->success('任务监听主进程已经存在!'); } else { $this->error($message); } @@ -131,9 +135,9 @@ class Queue extends Controller { try { $message = nl2br($this->app->console->call('xadmin:queue', ['stop'])->fetch()); - if (stripos($message, 'succeeded')) { + if (stripos($message, 'sent end signal to process')) { $this->success('停止任务监听主进程成功!'); - } elseif (stripos($message, 'finish')) { + } elseif (stripos($message, 'processes to stop')) { $this->success('没有找到需要停止的进程!'); } else { $this->error($message);