github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-01 23:47:40 +00:00
Code Issues Projects Releases Wiki Activity

[Update] merge

Browse Source
This commit is contained in:
ibuler
2019-03-04 11:36:10 +08:00
parent 6004ef3f0d 7f71513085
commit a5fc04e0ce
76 changed files with 1836 additions and 976 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
apps/users/tasks.py
View File

@@ -9,18 +9,13 @@ from celery import shared_task
from ops.celery.utils import create_or_update_celery_periodic_tasks
from ops.celery.decorator import after_app_ready_start, register_as_period_task
from common.utils import get_logger
from .models import User, LoginLog
from .utils import write_login_log, send_password_expiration_reminder_mail
from .models import User
from .utils import send_password_expiration_reminder_mail
logger = get_logger(__file__)
@shared_task
def write_login_log_async(*args, **kwargs):
write_login_log(*args, **kwargs)
@shared_task
def check_password_expired():
users = User.objects.exclude(role=User.ROLE_APP)
@@ -48,13 +43,4 @@ def check_password_expired_periodic():
create_or_update_celery_periodic_tasks(tasks)
@register_as_period_task(interval=3600*24)
@shared_task
def clean_login_log_period():
now = timezone.now()
try:
days = int(settings.LOGIN_LOG_KEEP_DAYS)
except ValueError:
days = 90
expired_day = now - datetime.timedelta(days=days)
LoginLog.objects.filter(datetime__lt=expired_day).delete()