composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-12 23:14:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

#995 Make sure that tto/ttr passed gets set even if the CRON has not been run (and as soon as some overrun has been counted)

Browse Source 
SVN:trunk[3384]
This commit is contained in:
Romain Quetiez
2014-10-28 15:55:56 +00:00
parent a59915e5ee
commit 0135573956
4 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/ormstopwatch.class.inc.php
View File

@@ -130,6 +130,10 @@ class ormStopWatch
{
$bRet = true;
}
if (isset($aThresholdData['overrun']) && ($aThresholdData['overrun'] > 0))
{
$bRet = true;
}
}
return $bRet;
}
@@ -160,6 +164,7 @@ class ormStopWatch
$aDefs = $this->aThresholds[$iPercent];
if (array_key_exists('highlight', $aDefs) && is_array($aDefs['highlight']) && $this->IsThresholdPassed($iPercent))
{
// If persistant or SW running...
if (($aDefs['highlight']['persistent'] == true) || (($aDefs['highlight']['persistent'] == false) && !is_null($this->iLastStart)))
{
$sCode = $aDefs['highlight']['code'];