composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 02:58:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°3265 - Log stacktrace when cron exception raised with debug enabled

Browse Source
This commit is contained in:
odain
2020-08-21 10:25:05 +02:00
parent 6a25933744
commit d12e2e592a
2 changed files with 39 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/backgroundtask.class.inc.php
View File

@@ -26,6 +26,24 @@
*/ */
class BackgroundTask extends DBObject class BackgroundTask extends DBObject
{ {
protected $bDebug = false;
/**
* @return bool
*/
public function IsDebug(): bool
{
return $this->bDebug;
}
/**
* @param bool $bDebug
*/
public function SetDebug(bool $bDebug): void
{
$this->bDebug = $bDebug;
}
public static function Init() public static function Init()
{ {
$aParams = array $aParams = array

24
webservices/cron.php
View File

@@ -112,7 +112,14 @@ function RunTask($oProcess, BackgroundTask $oTask, $oStartDate, $iTimeLimit)
} }
catch (Exception $e) // we shouldn't get so much exceptions... but we need to handle legacy code, and cron.php has to keep running catch (Exception $e) // we shouldn't get so much exceptions... but we need to handle legacy code, and cron.php has to keep running
{ {
$sMessage = 'Processing failed with message: '.$e->getMessage(); if ($oTask->IsDebug())
{
$sMessage = 'Processing failed with message: '.$e->getTraceAsString();
}
else
{
$sMessage = 'Processing failed with message: '.$e->getMessage();
}
} }
$fDuration = microtime(true) - $fStart; $fDuration = microtime(true) - $fStart;
if ($oTask->Get('total_exec_count') == 0) if ($oTask->Get('total_exec_count') == 0)
@@ -164,8 +171,18 @@ function RunTask($oProcess, BackgroundTask $oTask, $oStartDate, $iTimeLimit)
* @param CLIPage|WebPage $oP * @param CLIPage|WebPage $oP
* @param iProcess[] $aProcesses * @param iProcess[] $aProcesses
* @param boolean $bVerbose * @param boolean $bVerbose
* @param bool $bDebug
*
* @throws \ArchivedObjectException
* @throws \CoreCannotSaveObjectException
* @throws \CoreException
* @throws \CoreUnexpectedValue
* @throws \CoreWarning
* @throws \MySQLException
* @throws \OQLException
* @throws \ReflectionException
*/ */
function CronExec($oP, $aProcesses, $bVerbose) function CronExec($oP, $aProcesses, $bVerbose, $bDebug=false)
{ {
$iStarted = time(); $iStarted = time();
$iMaxDuration = MetaModel::GetConfig()->Get('cron_max_execution_time'); $iMaxDuration = MetaModel::GetConfig()->Get('cron_max_execution_time');
@@ -256,6 +273,7 @@ function CronExec($oP, $aProcesses, $bVerbose)
{ {
// New entry, let's create a new BackgroundTask record, and plan the first execution // New entry, let's create a new BackgroundTask record, and plan the first execution
$oTask = new BackgroundTask(); $oTask = new BackgroundTask();
$oTask->SetDebug($bDebug);
$oTask->Set('class_name', get_class($oProcess)); $oTask->Set('class_name', get_class($oProcess));
$oTask->Set('total_exec_count', 0); $oTask->Set('total_exec_count', 0);
$oTask->Set('min_run_duration', 99999.999); $oTask->Set('min_run_duration', 99999.999);
@@ -591,7 +609,7 @@ try
{ {
if ($oMutex->TryLock()) if ($oMutex->TryLock())
{ {
CronExec($oP, $aProcesses, $bVerbose); CronExec($oP, $aProcesses, $bVerbose, $bDebug);
} }
else else
{ {