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

added human readable ttl

parent 47c1cc39
Branches
No related tags found
No related merge requests found
...@@ -100,7 +100,7 @@ class cronlogrenderer extends cronlog{ ...@@ -100,7 +100,7 @@ class cronlogrenderer extends cronlog{
$aErrors[]='outdated since ' . date("Y-m-d H:i", $iNextRunErr) . ' (+'.$this->_iExpiredJobsFailAfter.'min)'; $aErrors[]='outdated since ' . date("Y-m-d H:i", $iNextRunErr) . ' (+'.$this->_iExpiredJobsFailAfter.'min)';
} }
if($aEntry['SCRIPTRC']>0){ if($aEntry['SCRIPTRC']>0){
$aErrors[]='exitcode is '.$aEntry['SCRIPTRC'].' (<>0)'; $aErrors[]='exitcode is '.(int)$aEntry['SCRIPTRC'].' (<>0)';
} }
if(!$aEntry['SCRIPTLABEL']){ if(!$aEntry['SCRIPTLABEL']){
$aErrors[]='no label?'; $aErrors[]='no label?';
...@@ -113,6 +113,16 @@ class cronlogrenderer extends cronlog{ ...@@ -113,6 +113,16 @@ class cronlogrenderer extends cronlog{
$iOK++; $iOK++;
} }
// human readable TTL value ... SCRIPTTTL is in [min]
$sTtlHr='';
if((int)$aEntry['SCRIPTTTL']>60*24*3){
$sTtlHr.='='.round((int)$aEntry['SCRIPTTTL']/60/24).'d ';
} else if((int)$aEntry['SCRIPTTTL']>60*3){
$sTtlHr.='='.round((int)$aEntry['SCRIPTTTL']/60).'h';
}
$sTtlHr=$sTtlHr ? '('.$sTtlHr.')' : '';
// render table of last logfile per cron job
$sHtml.='<tr onclick="showFile(\''.$aEntry['logfile'].'\');" title="Klick=['.$aEntry['logfile'].'] anzeigen ">' $sHtml.='<tr onclick="showFile(\''.$aEntry['logfile'].'\');" title="Klick=['.$aEntry['logfile'].'] anzeigen ">'
. '<td>'.date("Y-m-d H:i:s", $aEntry['SCRIPTSTARTTIME']).'</td>' . '<td>'.date("Y-m-d H:i:s", $aEntry['SCRIPTSTARTTIME']).'</td>'
// . '<td>'.$aEntry['SCRIPTNAME'].'</td>' // . '<td>'.$aEntry['SCRIPTNAME'].'</td>'
...@@ -128,6 +138,7 @@ class cronlogrenderer extends cronlog{ ...@@ -128,6 +138,7 @@ class cronlogrenderer extends cronlog{
.($aEntry['SCRIPTTTL']<$this->_iMinTtl ? ' class="message-warning" title="(using minimal TTL = '.$this->_iMinTtl.' min)"' : '') .($aEntry['SCRIPTTTL']<$this->_iMinTtl ? ' class="message-warning" title="(using minimal TTL = '.$this->_iMinTtl.' min)"' : '')
. '>' . '>'
.$aEntry['SCRIPTTTL'] .$aEntry['SCRIPTTTL']
.$sTtlHr
.'</td>' .'</td>'
. '<td class="'.($aEntry['SCRIPTRC']>0 ? 'message-error' : 'message-ok' ).'">' . '<td class="'.($aEntry['SCRIPTRC']>0 ? 'message-error' : 'message-ok' ).'">'
.$aEntry['SCRIPTRC'] .$aEntry['SCRIPTRC']
...@@ -136,7 +147,7 @@ class cronlogrenderer extends cronlog{ ...@@ -136,7 +147,7 @@ class cronlogrenderer extends cronlog{
? ($iNextRunErr < date("U") ? 'message-error' : 'message-warning') ? ($iNextRunErr < date("U") ? 'message-error' : 'message-warning')
: '' ).'">' : '' ).'">'
. date("Y-m-d H:i", $iNextRun).'</td>' . date("Y-m-d H:i", $iNextRun).'</td>'
. '<td'.(count($aErrors) ? ' class="message-error" title="'.implode("\n", $aErrors).'"' : '' ).'>' . '<td'.(count($aErrors) ? ' class="message-error" title="- '.implode("\n- ", $aErrors).'"' : '' ).'>'
// .(count($aErrors) ? 'FEHLER:<br>*'.implode('<br>*', $aErrors) : 'OK').'</td>' // .(count($aErrors) ? 'FEHLER:<br>*'.implode('<br>*', $aErrors) : 'OK').'</td>'
.(count($aErrors) ? 'FEHLER' : 'OK').'</td>' .(count($aErrors) ? 'FEHLER' : 'OK').'</td>'
// . '<td><button onclick="showFile(\''.$aEntry['logfile'].'\');">Ansehen</button></td>' // . '<td><button onclick="showFile(\''.$aEntry['logfile'].'\');">Ansehen</button></td>'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment