Skip to content
Snippets Groups Projects
Commit 435ffe51 authored by Hahn Axel (hahn)'s avatar Hahn Axel (hahn)
Browse files

use a minmal ttl value before warning

parent 761c64b9
No related branches found
No related tags found
No related merge requests found
......@@ -91,9 +91,13 @@ class cronlogrenderer extends cronlog{
$iLast=max(array($iLast, date("U", $aEntry['SCRIPTSTARTTIME'])));
$aErrors=array();
$iTtlUsed=min($aEntry['SCRIPTTTL'], $this->_iMinTtl);
$iNextRun=$aEntry['SCRIPTSTARTTIME']+((int)$aEntry['SCRIPTTTL']*60);
if($iNextRun < date("U")-$this->_iExpiredJobsFailAfter){
$iNextRunWarn=$aEntry['SCRIPTSTARTTIME']+((int)$iTtlUsed*60);
$iNextRunErr=$aEntry['SCRIPTSTARTTIME']+((int)$this->_iExpiredJobsFailAfter*60);
if($iNextRunErr < date("U")){
$aErrors[]='outdated';
}
if($aEntry['SCRIPTRC']>0){
......@@ -123,12 +127,16 @@ class cronlogrenderer extends cronlog{
.(int)$aEntry['SCRIPTEXECTIME'].'s'
.((int)$aEntry['SCRIPTEXECTIME']>100 ? ' ('.round((int)$aEntry['SCRIPTEXECTIME']/60).'min)' : '')
.'</td>'
. '<td>'.$aEntry['SCRIPTTTL'].'</td>'
. '<td'
.($aEntry['SCRIPTTTL']<$this->_iMinTtl ? ' class="message-warning" title="(using minimal TTL = '.$this->_iMinTtl.' min)"' : '')
. '>'
.$aEntry['SCRIPTTTL']
.'</td>'
. '<td class="'.($aEntry['SCRIPTRC']>0 ? 'message-error' : 'message-ok' ).'">'
.$aEntry['SCRIPTRC']
.'</td>'
. '<td class="'.($iNextRun < date("U")
? ($iNextRun < date("U") - $this->_iExpiredJobsFailAfter ? 'message-error' : 'message-warning')
. '<td class="'.($iNextRunWarn < date("U")
? ($iNextRunErr < date("U") ? 'message-error' : 'message-warning')
: '' ).'">'
. date("Y-m-d H:i", $iNextRun).'</td>'
. '<td class="'.(count($aErrors) ? 'message-error' : '' ).'">'
......
......@@ -44,6 +44,7 @@ class cronlog {
* @var integer
*/
protected $_iExpiredJobsFailAfter = 60*30; // in sec
protected $_iMinTtl = 0; // in sec
protected $_aSkipJoblogs = array();
protected $_aServers = array();
......@@ -67,6 +68,7 @@ class cronlog {
$aCfgTemp=include(__DIR__.'/../config/inc_cronlog.php');
$this->_sDataDir = isset($aCfgTemp['sDatadir']) ? $aCfgTemp['sDatadir'] : $this->_sDataDir;
$this->_iTtlCache = isset($aCfgTemp['iTtlCache']) ? (int)$aCfgTemp['iTtlCache'] : $this->_iTtlCache;
$this->_iMinTtl = isset($aCfgTemp['iMinTtl']) ? (int)$aCfgTemp['iMinTtl'] : $this->_iMinTtl;
$this->_iExpiredJobsFailAfter = isset($aCfgTemp['iExpiredJobsFailAfter']) ? (int)$aCfgTemp['iExpiredJobsFailAfter'] : $this->_iExpiredJobsFailAfter;
$this->_aSkipJoblogs = isset($aCfgTemp['aHidelogs']) && is_array($aCfgTemp['aHidelogs']) ? $aCfgTemp['aHidelogs'] : $this->_aSkipJoblogs;
}
......
......@@ -23,8 +23,12 @@ return array(
// caching time for serverinfos
'iTtlCache'=>60,
// when show an error for expired jobs (latency to execute job and sync logs)
'iExpiredJobsFailAfter'=>60*30,
// set minmal TTL (cronjobs with lower TTL will usethat limit) [min]
// minimum is cycle how often the log sync is running
'iMinTtl'=>10,
// when show an error for expired jobs (latency to execute job and sync logs) [min]
'iExpiredJobsFailAfter'=>30,
// hide these cronjob labels in the web gui tab "history"
'aHidelogs'=>array(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment