From aebdb4a1115d951ee43739c33f94f9492f2f63bb Mon Sep 17 00:00:00 2001 From: Benjamin Renard Date: Fri, 8 May 2020 12:48:06 +0200 Subject: [PATCH] Add LSlog_staticLoggerClass and use it for LSurl --- .../class/class.LSlog_staticLoggerClass.php | 62 +++++++++++++++++++ src/includes/class/class.LSurl.php | 35 +---------- 2 files changed, 64 insertions(+), 33 deletions(-) create mode 100644 src/includes/class/class.LSlog_staticLoggerClass.php diff --git a/src/includes/class/class.LSlog_staticLoggerClass.php b/src/includes/class/class.LSlog_staticLoggerClass.php new file mode 100644 index 00000000..4b874772 --- /dev/null +++ b/src/includes/class/class.LSlog_staticLoggerClass.php @@ -0,0 +1,62 @@ + + */ +class LSlog_staticLoggerClass { + + // Logger + protected static $logger = null; + + /* + * Log a message via class logger + * + * @param[in] $level string The log level (see LSlog) + * @param[in] $message string The message to log + * + * @retval void + **/ + protected static function log($level, $message) { + if (is_null(self :: $logger)) + self :: $logger = LSlog :: get_logger(get_called_class()); + self :: $logger -> logging($level, $message); + } + + /** + * Log an exception via class logger + * + * @param[in] $exception Exception The exception to log + * @param[in] $prefix string|null Custom message prefix (optional, see self :: log_exception()) + * @param[in] $fatal boolean Log exception as a fatal error (optional, default: true) + * + * @retval void + **/ + protected static function log_exception($exception, $prefix=null, $fatal=true) { + if (is_null(self :: $logger)) + self :: $logger = LSlog :: get_logger(get_called_class()); + self :: $logger -> exception($exception, $prefix, $fatal); + } + +} diff --git a/src/includes/class/class.LSurl.php b/src/includes/class/class.LSurl.php index 32133b1e..7fb10bb6 100644 --- a/src/includes/class/class.LSurl.php +++ b/src/includes/class/class.LSurl.php @@ -21,13 +21,14 @@ ******************************************************************************/ LSsession :: loadLSclass('LSurlRequest'); +LSsession :: loadLSclass('LSlog_staticLoggerClass'); /** * URL Routing Manager for LdapSaisie * * @author Benjamin Renard */ -class LSurl { +class LSurl extends LSlog_staticLoggerClass { /* * Configured URL patterns : @@ -56,38 +57,6 @@ class LSurl { // Rewrited request param const REWRITED_REQUEST_PARAM = 'REQUESTED_URL'; - // Logger - private static $logger = null; - - /* - * Log a message via class logger - * - * @param[in] $level string The log level (see LSlog) - * @param[in] $message string The message to log - * - * @retval void - **/ - private static function log($level, $message) { - if (is_null(self :: $logger)) - self :: $logger = LSlog :: get_logger('LSurl'); - self :: $logger -> logging($level, $message); - } - - /** - * Log an exception via class logger - * - * @param[in] $exception Exception The exception to log - * @param[in] $prefix string|null Custom message prefix (optional, see self :: log_exception()) - * @param[in] $fatal boolean Log exception as a fatal error (optional, default: true) - * - * @retval void - **/ - public static function log_exception($exception, $prefix=null, $fatal=true) { - if (is_null(self :: $logger)) - self :: $logger = LSlog :: get_logger('LSurl'); - self :: $logger -> exception($exception, $prefix, $fatal); - } - /** * Add an URL pattern *