mirror
/
fastadmin
mirror of https://gitee.com/karson/fastadmin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request !9 from trytodie/master

pull/323483/MERGE
trytodie 2017-06-19 18:43:39 +08:00 committed by Karson
parent 260034a732 38f166004e
commit b48a6db08c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
application/index/controller/Autotask.php
View File

@ -62,7 +62,7 @@ class Autotask extends Controller
if ($crontab['maximums'] && $crontab['executes'] > $crontab['maximums']) if ($crontab['maximums'] && $crontab['executes'] > $crontab['maximums'])
{ {
//任务已超过最大执行次数 //任务已超过最大执行次数
$update['status'] = 'finished'; $update['status'] = 'completed';
} }
else if ($crontab['endtime'] > 0 && $time > $crontab['endtime']) else if ($crontab['endtime'] > 0 && $time > $crontab['endtime'])
{ {
@ -83,7 +83,7 @@ class Autotask extends Controller
{ {
$update['executetime'] = $time; $update['executetime'] = $time;
$update['executes'] = $crontab['executes'] + 1; $update['executes'] = $crontab['executes'] + 1;
$update['status'] = ($crontab['maximums'] > 0 && $update['executes'] >= $crontab['maximums']) ? 'finished' : 'normal'; $update['status'] = ($crontab['maximums'] > 0 && $update['executes'] >= $crontab['maximums']) ? 'completed' : 'normal';
} }
// 如果需要更新状态 // 如果需要更新状态
@ -118,7 +118,7 @@ class Autotask extends Controller
else if ($crontab['type'] == 'shell') else if ($crontab['type'] == 'shell')
{ {
// 执行Shell // 执行Shell
exec('nohup php ' . $crontab['content'] . ' >> ' . $logDir . date("Y-m-d") . '.log 2>&1 &'); exec( $crontab['content'] . ' >> ' . $logDir . date("Y-m-d") . '.log 2>&1 &');
} }
} }
catch (Exception $e) catch (Exception $e)