flo/nsupdate.info
1
0
Fork 0
Code Issues 1 Pull Requests 2 Packages Releases Activity

Merge pull request #371 from ThomasWaldmann/fix-stale-users-check

Browse Source 
Fix stale users check
This commit is contained in:
TW 2018-10-01 16:50:08 +02:00 committed by GitHub
commit 5d25e6b7a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nsupdate/management/commands/users.py
View File

@ -17,10 +17,10 @@ T_age = 365 * DAY # min. age of last login for considering deletion of a user
NEVER = datetime.fromtimestamp(DAY, timezone.utc) # 2.1.1970 NEVER = datetime.fromtimestamp(DAY, timezone.utc) # 2.1.1970
LOG_MSG_DELETE = _("%%(user)s hasn't logged in for %(age)fy, has no hosts and no domains -> deleted user.") LOG_MSG_DELETE = _("%%(user)r hasn't logged in for %(age)fy, has no hosts and no domains -> deleted user.")
LOG_MSG_HAS_HOSTS = _("%%(user)s kept, has hosts. age: %(age)fy, hosts: %(hosts)d.") LOG_MSG_HAS_HOSTS = _("%%(user)r kept, has hosts. age: %(age)fy, hosts: %(hosts)d.")
LOG_MSG_HAS_DOMAINS = _("%%(user)s kept, has domains. age: %(age)fy, hosts: %(hosts)d, domains: %(domains)d.") LOG_MSG_HAS_DOMAINS = _("%%(user)r kept, has domains. age: %(age)fy, hosts: %(hosts)d, domains: %(domains)d.")
LOG_MSG_RECENTLY_USED = _("%(user)s kept, was used recently.") LOG_MSG_RECENTLY_USED = _("%(user)r kept, was used recently.")
def check_staleness(u): def check_staleness(u):
@ -77,6 +77,7 @@ class Command(BaseCommand):
print_stats("before") print_stats("before")
for u in User.objects.all(): for u in User.objects.all():
user = "%s <%s>" % (u.username, u.email) user = "%s <%s>" % (u.username, u.email)
log_msg = None
if stale_check: if stale_check:
log_msg = check_staleness(u) log_msg = check_staleness(u)
if log_msg: if log_msg: