extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-16 10:21:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

allow to set a higher account-import log-level then "info"

Browse Source
This commit is contained in:
ralf 2023-08-15 16:02:54 +02:00
parent 2faa699325
commit 303dc2bc70
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
api/src/Accounts/Import.php
View File

@ -157,22 +157,23 @@ class Import
call_user_func($this->_logger, $message, $level); 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 to file too
$log = $GLOBALS['egw_info']['server']['files_dir'].'/'.self::LOG_FILE; $log = $GLOBALS['egw_info']['server']['files_dir'].'/'.self::LOG_FILE;
if (!file_exists($dir=dirname($log)) && !mkdir($dir) || !is_dir($dir) || if (!file_exists($dir=dirname($log)) && !mkdir($dir) || !is_dir($dir) ||
!($fp = fopen($log, 'a+'))) !($fp = fopen($log, 'a+')))
{ {
if (!in_array($level, ['debug', 'detail'])) error_log(__METHOD__.' '.strtoupper($level).' '.$message);
{
error_log(__METHOD__.' '.strtoupper($level).' '.$message);
}
} }
else else
{ {
if ($this->_logger || !in_array($level, ['debug', 'detail']))
{
fwrite($fp, date('Y-m-d H:i:s O').' '.strtoupper($level).' '.$message."\n"); fwrite($fp, date('Y-m-d H:i:s O').' '.strtoupper($level).' '.$message."\n");
}
} }
if (!empty($fp)) fclose($fp); if (!empty($fp)) fclose($fp);
} }
@ -908,7 +909,7 @@ class Import
$import = new self(); $import = new self();
$import->logger(date('Y-m-d H:i:s O').' LDAP account import started', 'info'); $import->logger(date('Y-m-d H:i:s O').' LDAP account import started', 'info');
$import->run(false); $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) { catch (\InvalidArgumentException $e) {
_egw_log_exception($e); _egw_log_exception($e);
@ -918,7 +919,7 @@ class Import
} }
catch (\Exception $e) { catch (\Exception $e) {
_egw_log_exception($e); _egw_log_exception($e);
$import->logger('Error: '.$e->getMessage()); $import->logger('Error: '.$e->getMessage(), 'fatal');
} }
} }

11
setup/templates/default/config.tpl
View File

@ -129,6 +129,7 @@
<select name="newsettings[auth_type]"> <select name="newsettings[auth_type]">
{hook_auth_types} {hook_auth_types}
</select> </select>
<input type="hidden" value="" name="newsettings[auth_log]"/>
<label><input type="checkbox" value="True" {checked_auth_log_True} name="newsettings[auth_log]"/> <label><input type="checkbox" value="True" {checked_auth_log_True} name="newsettings[auth_log]"/>
{lang_Enable_logging_of_authentication_to_files-directory}: auth.log</label> {lang_Enable_logging_of_authentication_to_files-directory}: auth.log</label>
</td> </td>
@ -177,6 +178,7 @@
<tr class="row_off"> <tr class="row_off">
<td>{lang_Fallback_Authentication}:</td> <td>{lang_Fallback_Authentication}:</td>
<td> <td>
<input type="hidden" value="" name="newsettings[auth_fallback]"/>
<label><input type="checkbox" value="True" {checked_auth_fallback_True} name="newsettings[auth_fallback]"/> <label><input type="checkbox" value="True" {checked_auth_fallback_True} name="newsettings[auth_fallback]"/>
{lang_If_primary_authentication_is_NOT_successful_fall_back_to_passwords_synced_into_account-storage}</label> {lang_If_primary_authentication_is_NOT_successful_fall_back_to_passwords_synced_into_account-storage}</label>
</td> </td>
@ -495,7 +497,7 @@
<option value="deactivate" {selected_account_import_delete_deactivate}>{lang_Deactivate_user}</option> <option value="deactivate" {selected_account_import_delete_deactivate}>{lang_Deactivate_user}</option>
<option value="no" {selected_account_import_delete_no}>{lang_Do_NOT_check_for_deleted_user}</option> <option value="no" {selected_account_import_delete_no}>{lang_Do_NOT_check_for_deleted_user}</option>
</select> </select>
<br/><i>Deleting or disabling no longer existing accounts works currently only by using manual inital import!</i> <br/><i>Deleting or disabling no longer existing accounts works currently only by using manual initial import!</i>
</td> </td>
</tr> </tr>
<tr class="row_off"> <tr class="row_off">
@ -505,7 +507,12 @@
<input type="number" name="newsettings[account_import_frequency]" style="width: 3em" value="{value_account_import_frequency}"/> <input type="number" name="newsettings[account_import_frequency]" style="width: 3em" value="{value_account_import_frequency}"/>
{lang_hours_at} {lang_hours_at}
<input type="time" name="newsettings[account_import_time]" value="{value_account_import_time}"/> <input type="time" name="newsettings[account_import_time]" value="{value_account_import_time}"/>
{lang_logs_to}: {value_files_dir}/setup/account-import.log {lang_Log-Level}: <select name="newsettings[account_import_loglevel]">
<option value="info" {selected_account_import_loglevel_info}>Info</option>
<option value="detail" {selected_account_import_loglevel_detail}>Detail</option>
<option value="debug" {selected_account_import_loglevel_debug}>Debug</option>
</select>
<br/>{lang_logs_to}: {value_files_dir}/setup/account-import.log
</td> </td>
</tr> </tr>
<tr class="row_on"> <tr class="row_on">