From 4f5d78db9d819299eafb5be9a38384e0dcb06a70 Mon Sep 17 00:00:00 2001 From: "Hahn Axel (hahn)" <axel.hahn@iml.unibe.ch> Date: Fri, 28 Oct 2022 16:50:37 +0200 Subject: [PATCH] check hostname --- classes/cronlog-renderer.class.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/classes/cronlog-renderer.class.php b/classes/cronlog-renderer.class.php index 96b8637..7df4099 100644 --- a/classes/cronlog-renderer.class.php +++ b/classes/cronlog-renderer.class.php @@ -74,7 +74,6 @@ class cronlogrenderer extends cronlog{ if(!$aData){ $aData=$this->getServersLastLog(); } - $sTblHead=''; $iOK=0; $iErrors=0; @@ -95,6 +94,15 @@ class cronlogrenderer extends cronlog{ $iNextRun=$aEntry['SCRIPTSTARTTIME']+((int)$aEntry['SCRIPTTTL']*60); $iNextRunWarn=$aEntry['SCRIPTSTARTTIME']+((int)$iTtlUsed*60); $iNextRunErr=$aEntry['SCRIPTSTARTTIME']+(((int)$aEntry['SCRIPTTTL']+(int)$this->_iExpiredJobsFailAfter)*60); + + // ticket #5850 - check hostname vs. servername in logfile + $sServerFromLogfile=preg_replace('/_.*/', '', basename($aEntry['logfile'])); + if($sServerFromLogfile!=$aEntry['server']){ + $aErrors[]=[ + 'Hostname?', + 'Der Hostname im Log ['.$sServerFromLogfile.'] stimmt nicht mit Servernamen ['.$aEntry['server'].'] überein.', + ]; + } if($iNextRunErr < date("U")){ $aErrors[]=[ @@ -175,6 +183,7 @@ class cronlogrenderer extends cronlog{ $sIdTable='datatable1'; $sHtml=' <!-- START '.__METHOD__.' --> + <pre>'.print_r($aData, 1).'</pre> ' . '<h3>Letztes Logfile pro Job</h3>' -- GitLab