diff --git a/api/src/Accounts/Import.php b/api/src/Accounts/Import.php index 19e2ea8343..5aae69d57c 100644 --- a/api/src/Accounts/Import.php +++ b/api/src/Accounts/Import.php @@ -157,22 +157,23 @@ class Import call_user_func($this->_logger, $message, $level); } + $loglevel = $GLOBALS['egw_info']['server']['account_import_loglevel'] ?? 'info'; + if ($loglevel === 'info' && in_array($level, ['debug', 'detail']) || + $loglevel === 'detail' && $level === 'debug') + { + return; + } + // log to file too $log = $GLOBALS['egw_info']['server']['files_dir'].'/'.self::LOG_FILE; if (!file_exists($dir=dirname($log)) && !mkdir($dir) || !is_dir($dir) || !($fp = fopen($log, 'a+'))) { - if (!in_array($level, ['debug', 'detail'])) - { - error_log(__METHOD__.' '.strtoupper($level).' '.$message); - } + error_log(__METHOD__.' '.strtoupper($level).' '.$message); } else { - if ($this->_logger || !in_array($level, ['debug', 'detail'])) - { fwrite($fp, date('Y-m-d H:i:s O').' '.strtoupper($level).' '.$message."\n"); - } } if (!empty($fp)) fclose($fp); } @@ -908,7 +909,7 @@ class Import $import = new self(); $import->logger(date('Y-m-d H:i:s O').' LDAP account import started', 'info'); $import->run(false); - $import->logger(date('Y-m-d H:i:s O').' LDAP account import finished'.(!empty($fp)?"\n":''), 'info'); + $import->logger(date('Y-m-d H:i:s O').' LDAP account import finished', 'info'); } catch (\InvalidArgumentException $e) { _egw_log_exception($e); @@ -918,7 +919,7 @@ class Import } catch (\Exception $e) { _egw_log_exception($e); - $import->logger('Error: '.$e->getMessage()); + $import->logger('Error: '.$e->getMessage(), 'fatal'); } } diff --git a/setup/templates/default/config.tpl b/setup/templates/default/config.tpl index 31fcc1ed59..ff6d273ea5 100644 --- a/setup/templates/default/config.tpl +++ b/setup/templates/default/config.tpl @@ -129,6 +129,7 @@ + @@ -177,6 +178,7 @@ {lang_Fallback_Authentication}: + @@ -495,7 +497,7 @@ -
Deleting or disabling no longer existing accounts works currently only by using manual inital import! +
Deleting or disabling no longer existing accounts works currently only by using manual initial import! @@ -505,7 +507,12 @@ {lang_hours_at} - {lang_logs_to}: {value_files_dir}/setup/account-import.log + {lang_Log-Level}: +
{lang_logs_to}: {value_files_dir}/setup/account-import.log