From 78702006c71df14d5082bc5a9835527ed944100e Mon Sep 17 00:00:00 2001 From: vapao Date: Sun, 6 Mar 2022 23:16:01 +0800 Subject: [PATCH] =?UTF-8?q?A=20=E5=B0=86=E8=87=AA=E5=8A=A8=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E8=B6=85=E8=BF=87=E4=B8=80=E5=91=A8=E4=B8=94=E5=B7=B2?= =?UTF-8?q?=E8=AF=BB=E7=9A=84=E7=B3=BB=E7=BB=9F=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- spug_api/apps/schedule/builtin.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/spug_api/apps/schedule/builtin.py b/spug_api/apps/schedule/builtin.py index 64d4828..54effa2 100644 --- a/spug_api/apps/schedule/builtin.py +++ b/spug_api/apps/schedule/builtin.py @@ -4,20 +4,23 @@ from django.db import connections from apps.account.models import History from apps.alarm.models import Alarm -from apps.schedule.models import Task +from apps.schedule.models import Task, History as TaskHistory from apps.deploy.models import DeployRequest from apps.exec.models import ExecHistory +from apps.notify.models import Notify from apps.deploy.utils import dispatch -from libs.utils import parse_time, human_datetime +from libs.utils import parse_time, human_datetime, human_date from datetime import datetime, timedelta from threading import Thread def auto_run_by_day(): try: - date = datetime.now() - timedelta(days=30) - History.objects.filter(created_at__lt=date.strftime('%Y-%m-%d')).delete() - Alarm.objects.filter(created_at__lt=date.strftime('%Y-%m-%d')).delete() + date_7 = human_date(datetime.now() - timedelta(days=7)) + date_30 = human_date(datetime.now() - timedelta(days=30)) + History.objects.filter(created_at__lt=date_30).delete() + Notify.objects.filter(created_at__lt=date_7, unread=False).delete() + Alarm.objects.filter(created_at__lt=date_30).delete() try: record = ExecHistory.objects.all()[50] ExecHistory.objects.filter(id__lt=record.id).delete() @@ -25,8 +28,8 @@ def auto_run_by_day(): pass for task in Task.objects.all(): try: - record = History.objects.filter(task_id=task.id)[50] - History.objects.filter(task_id=task.id, id__lt=record.id).delete() + record = TaskHistory.objects.filter(task_id=task.id)[50] + TaskHistory.objects.filter(task_id=task.id, id__lt=record.id).delete() except IndexError: pass finally: