bn8/ldapsaisie
1
0
Fork 0
mirror of https://gitlab.easter-eggs.com/ee/ldapsaisie.git synced 2024-11-26 19:54:46 +01:00
Code Issues Projects Releases Wiki Activity

LSlog_handler : add excluded_loggers configuration parameter

Browse source
This commit is contained in:
Benjamin Renard 2020-05-08 13:18:17 +02:00
parent aebdb4a111
commit b574300ab3
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/conf/config.inc.php
View file

@ -198,6 +198,7 @@ $GLOBALS['LSlog']['handlers'] = array (
//'level' => 'DEBUG', //'level' => 'DEBUG',
// Filter on specific loggers // Filter on specific loggers
//'loggers' => array('LSurl', 'LSlang'), //'loggers' => array('LSurl', 'LSlang'),
'excluded_loggers' => array('generate_lang_file', 'generate_ldapsaisie_pot'),
// Default formats // Default formats
//'format' => '%{requesturi} - %{remoteaddr} - %{ldapservername} - %{authuser} - %{level} - %{message}', //'format' => '%{requesturi} - %{remoteaddr} - %{ldapservername} - %{authuser} - %{level} - %{message}',
//'cli_format' => '%{clibinpath} - %{level} - %{message}', //'cli_format' => '%{clibinpath} - %{level} - %{message}',

15
src/includes/class/class.LSlog_handler.php
View file

@ -40,6 +40,10 @@ class LSlog_handler {
// Default datetime format // Default datetime format
protected $default_datetime_format = 'Y/m/d H:i:s'; protected $default_datetime_format = 'Y/m/d H:i:s';
// Loggers filters
protected $loggers = array();
protected $excluded_loggers = array();
/** /**
* Constructor * Constructor
* *
@ -52,6 +56,9 @@ class LSlog_handler {
$this -> loggers = $this -> getConfig('loggers', array()); $this -> loggers = $this -> getConfig('loggers', array());
if (!is_array($this -> loggers)) if (!is_array($this -> loggers))
$this -> loggers = array($this -> loggers); $this -> loggers = array($this -> loggers);
$this -> excluded_loggers = $this -> getConfig('excluded_loggers', array());
if (!is_array($this -> excluded_loggers))
$this -> excluded_loggers = array($this -> excluded_loggers);
} }
/** /**
@ -102,7 +109,13 @@ class LSlog_handler {
* @retval bool True if message of this logger have to be logged, False otherwise * @retval bool True if message of this logger have to be logged, False otherwise
**/ **/
public function checkLogger($logger) { public function checkLogger($logger) {
return (!$this -> loggers || in_array($logger, $this -> loggers)); if (!$this -> loggers && !$this -> excluded_loggers)
return true;
if ($this -> loggers && in_array($logger, $this -> loggers))
return true;
if ($this -> excluded_loggers && !in_array($logger, $this -> excluded_loggers))
return true;
return false;
} }
/** /**