diff --git a/module/cron/control.php b/module/cron/control.php index 3e89130253..485334be88 100644 --- a/module/cron/control.php +++ b/module/cron/control.php @@ -197,7 +197,7 @@ class cron extends control if($now > $cron['time']) { - if(!$this->cron->changeStatusRunning($id, $cronInfo->lastTime)) continue; + if(!$this->cron->changeStatusRunning($id)) continue; $parsedCrons[$id]['time'] = $cron['cron']->getNextRunDate(); /* Execution command. */ diff --git a/test/class/cron.class.php b/test/class/cron.class.php index ae7fefe66d..d65af43a14 100644 --- a/test/class/cron.class.php +++ b/test/class/cron.class.php @@ -77,13 +77,12 @@ class cronTest * Change cron status to running test. * * @param int $cronID - * @param string $lastTime * @access public * @return bool|int */ - public function changeStatusRunningTest($cronID, $lastTime) + public function changeStatusRunningTest($cronID) { - $objects = $this->objectModel->changeStatusRunning($cronID, $lastTime); + $objects = $this->objectModel->changeStatusRunning($cronID); if(dao::isError()) return dao::getError(); diff --git a/test/model/cron/changestatusrunning.php b/test/model/cron/changestatusrunning.php index 74fb49228b..286ee65039 100755 --- a/test/model/cron/changestatusrunning.php +++ b/test/model/cron/changestatusrunning.php @@ -18,8 +18,7 @@ pid=1 $cron = new cronTest(); $cronID = 4; -$lastTime = '0000-00-00 00:00:00'; -$result = $cron->changeStatusRunningTest($cronID, $lastTime); +$result = $cron->changeStatusRunningTest($cronID); $cronInfo = $tester->cron->getById($cronID); r($result) && p() && e('1'); // 更新之后查看返回值是否是1