[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [13979] print jobs
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [13979] print jobs |
Date: |
Mon, 21 Sep 2015 13:16:46 +0000 |
Revision: 13979
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13979
Author: sigurdne
Date: 2015-09-21 13:16:45 +0000 (Mon, 21 Sep 2015)
Log Message:
-----------
print jobs
Modified Paths:
--------------
trunk/phpgwapi/cron/asyncservices.php
trunk/phpgwapi/inc/class.asyncservice.inc.php
Modified: trunk/phpgwapi/cron/asyncservices.php
===================================================================
--- trunk/phpgwapi/cron/asyncservices.php 2015-09-21 13:16:15 UTC (rev
13978)
+++ trunk/phpgwapi/cron/asyncservices.php 2015-09-21 13:16:45 UTC (rev
13979)
@@ -60,7 +60,8 @@
echo "Domain: {$GLOBALS['phpgw_info']['user']['domain']}\n";
echo 'Start cron: ' . date('Y/m/d H:i:s ') . "\n";
- $num = ExecMethod('phpgwapi.asyncservice.check_run','crontab');
+ $num = (int) ExecMethod('phpgwapi.asyncservice.check_run','crontab');
+ echo "Number of jobs: {$num}\n";
echo 'End cron: ' . date('Y/m/d H:i:s ') . "\n";
// if the following comment got removed, you will get an email from
cron for every check performed
//echo date('Y/m/d H:i:s ').$_GET['domain'].': '.($num ? "$num job(s)
executed" : 'Nothing to execute')."\n";
Modified: trunk/phpgwapi/inc/class.asyncservice.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.asyncservice.inc.php 2015-09-21 13:16:15 UTC
(rev 13978)
+++ trunk/phpgwapi/inc/class.asyncservice.inc.php 2015-09-21 13:16:45 UTC
(rev 13979)
@@ -428,8 +428,19 @@
{
try
{
- echo
"{$job['method']}\n";
+ echo 'Start job: ' .
date('Y/m/d H:i:s ') . "\n";
+ echo "--id:
{$job['id']}\n";
+ echo "--method:
{$job['method']}\n";
+ if(isset($job['data'])
&& $job['data'])
+ {
+ echo "--data: ";
+
print_r($job['data']);
+ echo "\n";
+ }
ExecMethod($job['method'],$job['data']);
+
+ echo 'End job: ' .
date('Y/m/d H:i:s ') . "\n\n";
+
}
catch (Exception $e)
{
@@ -453,24 +464,24 @@
$GLOBALS['phpgw']->db->Exception_On_Error = $this->Exception_On_Error;
- if ($job['next'] =
$this->next_run($job['times']))
- {
- $updated_jobs =
$this->read($id);
- if
(isset($updated_jobs[$id]) && isset($updated_jobs[$id]['data']))
- { // update async data
field, it could be changed during ExecMethod()
- $job['data'] =
$updated_jobs[$id]['data'];
- }
- // TK 20.11.06 write
job to get 'next' and alarm updated
- $job['data']['time'] =
$job['next'];
- $this->write($job);
+ if ($job['next'] =
$this->next_run($job['times']))
+ {
+ $updated_jobs =
$this->read($id);
+ if (isset($updated_jobs[$id])
&& isset($updated_jobs[$id]['data']))
+ { // update async data field,
it could be changed during ExecMethod()
+ $job['data'] =
$updated_jobs[$id]['data'];
}
- else // no further runs
+ // TK 20.11.06 write job to get
'next' and alarm updated
+ $job['data']['time'] =
$job['next'];
+ $this->write($job);
+ }
+ else // no further runs
+ {
+ if($job['next'] <= time())
{
- if($job['next'] <=
time())
- {
-
$this->delete($job['id']);
- }
+
$this->delete($job['id']);
}
+ }
}
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [13979] print jobs,
Sigurd Nes <=