composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-19 15:22:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°8772 - exceptions

Browse Source
This commit is contained in:
Eric Espie
2025-11-25 17:08:41 +01:00
parent 7a67267c7d
commit 7a515d04dd
6 changed files with 39 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/log.class.inc.php
View File

@@ -691,11 +691,26 @@ abstract class LogAPI
static::$m_oMockMetaModelConfig = $oMetaModelConfig;
}
public static function Exception(string $sMessage, throwable $previous, string $sChannel = null, array $aContext = []): void
public static function Exception(string $sMessage, throwable $oException, string $sChannel = null, array $aContext = []): void
{
$aContext['Error Message'] = $previous->getMessage();
$aContext['Stack Trace'] = $previous->getTraceAsString();
static::Error($sMessage, $sChannel, $aContext);
$aErrorLogs = [];
$aErrorLogs[] = static::PrepareErrorLog($sMessage, $oException, $aContext);
$oException = $oException->getPrevious();
while ($oException !== null) {
$aErrorLogs[] = static::PrepareErrorLog($oException->getMessage(), $oException, $aContext, true);
$oException = $oException->getPrevious();
}
$aErrorLogs = array_reverse($aErrorLogs);
foreach ($aErrorLogs as $aErrorLog) {
static::Error($aErrorLog['message'], $sChannel, $aErrorLog['context']);
}
}
private static function PrepareErrorLog(string $sMessage, throwable $oException, array $aContext, bool $isPrevious = false): array
{
$aContext['Error Message'] = $oException->getMessage();
$aContext['Stack Trace'] = $oException->getTraceAsString();
return ['message' => ($isPrevious ? "Previous " : '')."Exception: $sMessage", 'context' => $aContext];
}
public static function Error($sMessage, $sChannel = null, $aContext = [])

4
pages/UI.php
View File

@@ -1375,7 +1375,7 @@ try {
$oErrorPage->add("<h1>".Dict::S('UI:FatalErrorMessage')."</h1>\n");
}
$sErrorDetails = ($e instanceof CoreException) ? $e->getHtmlDesc() : $e->getMessage();
$oErrorPage->error(Dict::Format('UI:Error_Details', utils::EscapeHtml($sErrorDetails)));
$oErrorPage->error(Dict::Format('UI:Error_Details', utils::EscapeHtml($sErrorDetails)), $e);
$oErrorPage->output();
$sErrorStackTrace = ($e instanceof CoreException) ? $e->getFullStackTraceAsString() : $e->getTraceAsString();
@@ -1394,7 +1394,7 @@ try {
$oLog->Set('data', $aData);
$oLog->DBInsertNoReload();
} catch (Exception $e) {
IssueLog::Error("Failed to log issue into the DB");
IssueLog::Exception("Failed to log issue into the DB", $e);
}
}
}

2
sources/Application/TwigBase/Controller/Controller.php
View File

@@ -272,7 +272,7 @@ abstract class Controller extends AbstractController
$oP->add(get_class($e).' : '.utils::EscapeHtml($e->GetMessage()));
$oP->output();
IssueLog::Error($e->getMessage());
IssueLog::Exception('HandleOperation failed for '.json_encode($this->m_sOperation), $e);
}
}

10
sources/Application/WebPage/ErrorPage.php
View File

@@ -51,7 +51,7 @@ class ErrorPage extends NiceWebPage
$this->log_warning($sText);
}
public function error($sText)
public function error($sText, \Throwable $oException = null)
{
$this->add("<div class=\"message message-error\">$sText</div>");
if (utils::IsEasterEggAllowed()) {
@@ -59,6 +59,10 @@ class ErrorPage extends NiceWebPage
$this->add('<img src="'.utils::GetAbsoluteUrlAppRoot().'images/alpha-fatal-error.gif">');
$this->add('<div class="message message-valid">'.nl2br(Dict::S('UI:ErrorPage:KittyDisclaimer')).'</div>');
}
if (!is_null($oException)) {
$this->log_exception($sText, $oException);
return;
}
$this->log_error($sText);
}
@@ -78,6 +82,10 @@ class ErrorPage extends NiceWebPage
return parent::output();
}
public static function log_exception($sText, \Throwable $oException)
{
IssueLog::Exception($sText, $oException);
}
public static function log_error($sText)
{

2
sources/Forms/Block/Base/FormBlock.php
View File

@@ -43,6 +43,8 @@ class FormBlock extends AbstractTypeFormBlock
try {
// Build the form
$this->BuildForm();
} catch (FormsException $e) {
throw $e;
} catch (Exception $e) {
throw new FormBlockException('Unable to construct form', 0, $e);
}

7
sources/Forms/IO/Converter/OqlToClassConverter.php
View File

@@ -11,6 +11,7 @@ use Combodo\iTop\Service\DependencyInjection\DIException;
use Combodo\iTop\Service\DependencyInjection\DIService;
use Combodo\iTop\Forms\IO\Format\ClassIOFormat;
use Combodo\iTop\Forms\IO\FormBlockIOException;
use Exception;
/**
* OQL expression to class converter.
@@ -28,7 +29,11 @@ class OqlToClassConverter extends AbstractConverter
}
$oModelReflection = DIService::GetInstance()->GetService('ModelReflection');
$oQuery = $oModelReflection->GetQuery($oData);
try {
$oQuery = $oModelReflection->GetQuery($oData);
} catch (Exception $e) {
throw new FormBlockIOException($e->getMessage(), $e->getCode(), $e);
}
return new ClassIOFormat($oQuery->GetClass());
}
}