blackteay/ThinkAdmin
1
0
Fork 0
mirror of https://gitee.com/zoujingli/ThinkAdmin.git synced 2025-04-06 03:58:04 +08:00
Code Issues Projects Releases Wiki Activity

Update Queue.php

Browse Source
This commit is contained in:
Anyon 2020-05-11 16:43:58 +08:00
parent 2cf6b42003
commit 9c5c988ef7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/admin/controller/Queue.php
View File

@ -46,8 +46,8 @@ class Queue extends Controller
public function index() public function index()
{ {
if (AdminService::instance()->isSuper()) try { if (AdminService::instance()->isSuper()) try {
$this->command = ProcessService::instance()->think('xtask:start'); $this->command = ProcessService::instance()->think('xadmin:queue start');
$this->message = $this->app->console->call('xtask:state')->fetch(); $this->message = $this->app->console->call('xadmin:queue', ['status'])->fetch();
$this->listen = preg_match('/process.*?\d+.*?running/', $this->message, $attr); $this->listen = preg_match('/process.*?\d+.*?running/', $this->message, $attr);
} catch (\Exception $exception) { } catch (\Exception $exception) {
$this->listen = false; $this->listen = false;
@ -105,7 +105,7 @@ class Queue extends Controller
public function start() public function start()
{ {
try { try {
$message = nl2br($this->app->console->call('xtask:start')->fetch()); $message = nl2br($this->app->console->call('xadmin:queue', ['start'])->fetch());
if (preg_match('/process.*?\d+/', $message, $attr)) { if (preg_match('/process.*?\d+/', $message, $attr)) {
$this->success('任务监听主进程启动成功！'); $this->success('任务监听主进程启动成功！');
} else { } else {
@ -125,7 +125,7 @@ class Queue extends Controller
public function stop() public function stop()
{ {
try { try {
$message = nl2br($this->app->console->call('xtask:stop')->fetch()); $message = nl2br($this->app->console->call('xadmin:queue', ['stop'])->fetch());
if (stripos($message, 'succeeded')) { if (stripos($message, 'succeeded')) {
$this->success('停止任务监听主进程成功！'); $this->success('停止任务监听主进程成功！');
} elseif (stripos($message, 'finish')) { } elseif (stripos($message, 'finish')) {