mirror of
https://github.com/django-q2/django-q2.git
synced 2026-09-15 13:37:56 +08:00
52c04217e9
* Support for multi-queue, multi-cluster configuration. API changes include: * Adding `cluster` to async_task() parameters and Task model * Adding argument --name to qcluster command * Necessary adjustments to Conf and Broker classes * Some admin improvements * Add settings.Q_CLUSTER['ALT_CLUSTERS']: q_cluster config overrides for alternative clusters; Add Conf.CLUSTER_NAME: separate usage from Conf.PREFIX; QueueAdmin/OrmQ detail page enhanced: now displaying args/kwargs/q_options instead of encrypted payload. * if `cluster` argument is not set (the default), async_task() and schedule() will be handled by the default cluster; Documentation update. * Text cleanup * Documentation update. * Fix TIMEOUT setting in Windows for non-default cluster --------- Co-authored-by: Stan Triepels <1939656+GDay@users.noreply.github.com>
75 lines
2.3 KiB
Python
75 lines
2.3 KiB
Python
from datetime import datetime
|
|
import calendar
|
|
import inspect
|
|
from datetime import date
|
|
|
|
import django
|
|
from django.utils import timezone
|
|
from django.conf import settings
|
|
|
|
from django_q.conf import Conf
|
|
|
|
if django.VERSION < (4, 0):
|
|
# pytz is the default in django 3.2. Remove when no support for 3.2
|
|
from pytz import timezone as ZoneInfo
|
|
else:
|
|
try:
|
|
from zoneinfo import ZoneInfo
|
|
except ImportError:
|
|
from backports.zoneinfo import ZoneInfo
|
|
|
|
|
|
# credits: https://stackoverflow.com/a/4131114
|
|
# Made them aware of timezone
|
|
def add_months(d, months):
|
|
month = d.month - 1 + months
|
|
year = d.year + month // 12
|
|
month = month % 12 + 1
|
|
day = min(d.day, calendar.monthrange(year, month)[1])
|
|
return d.replace(year=year, month=month, day=day)
|
|
|
|
|
|
# credits: https://stackoverflow.com/a/15743908
|
|
# Changed the last line to make it a little easier to read and changed it to move
|
|
# February 29 to 28 next year.
|
|
def add_years(d, years):
|
|
"""Return a date that's `years` years after the date (or datetime)
|
|
object `d`. Return the same calendar date (month and day) in the
|
|
destination year, if it exists, otherwise use the previous day
|
|
(thus changing February 29 to February 28).
|
|
"""
|
|
try:
|
|
return d.replace(year=d.year + years)
|
|
except ValueError:
|
|
new_date = d + (date(d.year + years, 3, 1) - date(d.year, 3, 1))
|
|
return d.replace(year=new_date.year, month=new_date.month, day=new_date.day)
|
|
|
|
|
|
def get_func_repr(func):
|
|
# convert func to string
|
|
if inspect.isfunction(func):
|
|
return f"{func.__module__}.{func.__name__}"
|
|
elif inspect.ismethod(func) and hasattr(func.__self__, "__name__"):
|
|
return (
|
|
f"{func.__self__.__module__}." f"{func.__self__.__name__}.{func.__name__}"
|
|
)
|
|
else:
|
|
return str(func) if func else None
|
|
|
|
|
|
def localtime(value=None) -> datetime:
|
|
"""Override for timezone.localtime to deal with naive times and local times"""
|
|
if settings.USE_TZ:
|
|
if django.VERSION >= (4, 0) and settings.USE_DEPRECATED_PYTZ:
|
|
import pytz
|
|
|
|
convert_to_tz = pytz.timezone(Conf.TIME_ZONE)
|
|
else:
|
|
convert_to_tz = ZoneInfo(Conf.TIME_ZONE)
|
|
|
|
return timezone.localtime(value=value, timezone=convert_to_tz)
|
|
if value is None:
|
|
return datetime.now()
|
|
else:
|
|
return value
|