Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ldap: Use zulip.ldap logger in ZulipLDAPUserPopulator.

This commit is contained in:
Mateusz Mandera 2020-07-17 15:39:59 +02:00 committed by Tim Abbott
parent 1696c9ac20
commit 82660de591
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
zproject/backends.py
View File

@ -797,14 +797,14 @@ class ZulipLDAPUserPopulator(ZulipLDAPAuthBackendBase):
user_disabled_in_ldap = self.is_account_control_disabled_user(ldap_user)
if user_disabled_in_ldap:
if user.is_active:
logging.info("Deactivating user %s because they are disabled in LDAP.",
user.delivery_email)
ldap_logger.info("Deactivating user %s because they are disabled in LDAP.",
user.delivery_email)
do_deactivate_user(user)
# Do an early return to avoid trying to sync additional data.
return (user, built)
elif not user.is_active:
logging.info("Reactivating user %s because they are not disabled in LDAP.",
user.delivery_email)
ldap_logger.info("Reactivating user %s because they are not disabled in LDAP.",
user.delivery_email)
do_reactivate_user(user)
self.sync_avatar_from_ldap(user, ldap_user)