From 0dc03de7b28f405ae24d133a4ec09dab47ec25ee Mon Sep 17 00:00:00 2001 From: Pierre Goiffon Date: Tue, 29 Jun 2021 11:58:18 +0200 Subject: [PATCH] Log channels : switch 3.0.0 channels to constant also Those channels constants were introduced in support/2.7 with 8259a79c --- core/log.class.inc.php | 8 +++++--- pages/UI.php | 2 +- setup/setuputils.class.inc.php | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/core/log.class.inc.php b/core/log.class.inc.php index a8b94091f..c92db9a2f 100644 --- a/core/log.class.inc.php +++ b/core/log.class.inc.php @@ -540,9 +540,11 @@ class FileLog */ class LogChannels { - const DEADLOCK = 'DeadLock'; - const INLINE_IMAGE = 'InlineImage'; - const PORTAL = 'portal'; + public const CLI = 'CLI'; + public const CONSOLE = 'console'; + public const DEADLOCK = 'DeadLock'; + public const INLINE_IMAGE = 'InlineImage'; + public const PORTAL = 'portal'; } diff --git a/pages/UI.php b/pages/UI.php index 70c03a133..01f783bab 100644 --- a/pages/UI.php +++ b/pages/UI.php @@ -1879,7 +1879,7 @@ catch (Exception $e) { } $sOperationToLog = $operation ?? 'N/A'; - IssueLog::Debug('UI.php operation='.$sOperationToLog.', error='.$e->getMessage()."\n".$sErrorStackTrace, 'console'); + IssueLog::Debug('UI.php operation='.$sOperationToLog.', error='.$e->getMessage()."\n".$sErrorStackTrace, LogChannels::CONSOLE); } diff --git a/setup/setuputils.class.inc.php b/setup/setuputils.class.inc.php index 72b70cfc2..ca177af89 100644 --- a/setup/setuputils.class.inc.php +++ b/setup/setuputils.class.inc.php @@ -434,7 +434,7 @@ class SetupUtils // some CLI scripts are launched automatically // we need a log so that we don't miss errors after migration ! - IssueLog::Error($oCliPage->s_title.' '.$sMessageTitle, 'CLI', $aPhpCheckErrorsForPrint); + IssueLog::Error($oCliPage->s_title.' '.$sMessageTitle, LogChannels::CLI, $aPhpCheckErrorsForPrint); exit($iExitCode); }