Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* adjust for cron.

Browse Source
This commit is contained in:
wangyidong
2015-05-14 13:40:41 +08:00
parent b693b89d4c
commit 8c06ec0f0c
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/cron/config.php
+1 -1
View File
@@ -6,4 +6,4 @@ $config->cron->create->requiredFields = 'm,h,dom,mon,dow,command';
$config->cron->edit->requiredFields = 'm,h,dom,mon,dow,command';
$config->cron->maxRunDays = 8;
$config->cron->maxRunTime = 6 * 3600;
$config->cron->maxRunTime = 1800;
module/cron/control.php
+5 -2
View File
@@ -138,6 +138,7 @@ class cron extends control
/* Update last time. */
$this->cron->changeStatus(key($parsedCrons), 'normal', true);
$this->loadModel('common');
$startedTime = time();
while(true)
{
@@ -148,6 +149,7 @@ class cron extends control
/* Run crons. */
$now = new datetime('now');
$this->common->loadConfigFromDB();
foreach($parsedCrons as $id => $cron)
{
$cronInfo = $this->cron->getById($id);
@@ -156,7 +158,7 @@ class cron extends control
/* Skip cron that status is running and run time is less than max. */
if($cronInfo->status == 'running' and (time() - strtotime($cronInfo->lastTime)) < $this->config->cron->maxRunTime) continue;
/* Skip cron that last time is more than this cron time. */
if($cronInfo->lastTime > $cron['time']->format(DT_DATETIME1)) continue;
if($cronInfo->lastTime > $cron['time']->format(DT_DATETIME1)) die();
if($now > $cron['time'])
{
@@ -173,6 +175,7 @@ class cron extends control
parse_str($cron['command'], $params);
if(isset($params['moduleName']) and isset($params['methodName']))
{
$this->app->loadConfig($params['moduleName']);
$output = $this->fetch($params['moduleName'], $params['methodName']);
}
}
@@ -210,7 +213,7 @@ class cron extends control
/* Break while. */
if(connection_status() != CONNECTION_NORMAL) break;
if(((time() - $startedTime) / 3600 / 24) >= $this->config->cron->maxRunDays) break;
if(((time() - $startedTime) / 60/ 4) >= $this->config->cron->maxRunDays) break;
}
/* Revert cron status to stop. */