Refactored exception logging

2020-12-12 08:11:00 +01:00
parent 1ae778d81e
commit b637a63e71
10 changed files with 27 additions and 51 deletions
@@ -316,10 +316,7 @@ def import_ldap_users():
    try:
        new_users = services.ldap.get_group_members(config.config_ldap_group_name)
    except (services.ldap.LDAPException, TypeError, AttributeError, KeyError) as e:
-        if config.config_log_level == logger.logging.DEBUG:
-            log.exception(e)
-        else:
-            log.error(e)
+        log.debug_or_exception(e)
        showtext['text'] = _(u'Error: %(ldaperror)s', ldaperror=e)
        return json.dumps(showtext)
    if not new_users:
@@ -347,10 +344,7 @@ def import_ldap_users():
        try:
            user_data = services.ldap.get_object_details(user=user_identifier, query_filter=query_filter)
        except AttributeError as e:
-            if config.config_log_level == logger.logging.DEBUG:
-                log.exception(e)
-            else:
-                log.error(e)
+            log.debug_or_exception(e)
            continue
        if user_data:
            user_login_field = extract_dynamic_field_from_filter(user, config.config_ldap_user_object)