Skip to content
Snippets Groups Projects

add running jobs

Merged Hahn Axel (hahn) requested to merge add-running-jobs into master
2 files
+ 30
10
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -111,7 +111,7 @@ class cronlogrenderer extends cronlog{
$sHtml='';
if(!$aData){
$aData=$this->getServersLastLog();
$aData=array_merge($this->getRunningJobs(), $this->getServersLastLog());
}
$sTblHead='';
$iOK=0;
@@ -201,7 +201,7 @@ class cronlogrenderer extends cronlog{
}
$sColStatus='<ul>'.$sColStatus.'</ul>';
} else {
$sColStatus.=$this->t('status-ok');
$sColStatus.=($aEntry['SCRIPTRC'] ? $this->t('status-ok') : '');
}
// render table of last logfile per cron job
$sHtml.='<tr onclick="showFile(\''.$aEntry['logfile'].'\');" title="'.sprintf($this->t('row-click-show-logfile'), $aEntry['logfile']).'">'
@@ -224,7 +224,7 @@ class cronlogrenderer extends cronlog{
.$sTtlHr
.'</td>'
. '<td class="'.($aEntry['SCRIPTRC']>0 ? 'message-error' : 'message-ok' ).'">'
.$aEntry['SCRIPTRC']
.($aEntry['SCRIPTRC'] ? $aEntry['SCRIPTRC'] : '⏳')
.'</td>'
. '<td class="'.($iNextRunWarn < date("U")
? ($iNextRunErr < date("U") ? 'message-error' : 'message-warning')
Loading