Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1934 from markdedeuge/bugfix/timezone_heartbeat

Browse Source 
use django timezone'd datetime to squash timezone warnings from worke…
This commit is contained in:
Oliver 2021-08-10 15:16:42 +10:00 committed by GitHub
commit b92ec751ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
InvenTree/InvenTree/tasks.py
View File

@ -6,7 +6,8 @@ import json
import requests import requests
import logging import logging
from datetime import datetime, timedelta from datetime import timedelta
from django.utils import timezone
from django.core.exceptions import AppRegistryNotReady from django.core.exceptions import AppRegistryNotReady
from django.db.utils import OperationalError, ProgrammingError from django.db.utils import OperationalError, ProgrammingError
@ -125,7 +126,7 @@ def heartbeat():
except AppRegistryNotReady: except AppRegistryNotReady:
return return
threshold = datetime.now() - timedelta(minutes=30) threshold = timezone.now() - timedelta(minutes=30)
# Delete heartbeat results more than half an hour old, # Delete heartbeat results more than half an hour old,
# otherwise they just create extra noise # otherwise they just create extra noise
@ -149,7 +150,7 @@ def delete_successful_tasks():
logger.info("Could not perform 'delete_successful_tasks' - App registry not ready") logger.info("Could not perform 'delete_successful_tasks' - App registry not ready")
return return
threshold = datetime.now() - timedelta(days=30) threshold = timezone.now() - timedelta(days=30)
results = Success.objects.filter( results = Success.objects.filter(
started__lte=threshold started__lte=threshold