Switch to using the bound class
This commit is contained in:
1 parent
d5bb2b750a
commit
1c5ae7b192
1 file changed
+6
-5
@@ -6,8 +6,9 @@ from django.utils import timezone
|
||||
from ..json import JSONEncoder
|
||||
# from common.json import JSONEncoder
|
||||
|
||||
|
||||
def set_verbose_name(task_wrapper, /, *args, vn_args=(), vn_fmt=None, **kwargs):
|
||||
# cls = TaskHistory
|
||||
# TaskHistory is defined below this function in this file
|
||||
def set_verbose_name(cls, task_wrapper, /, *args, vn_args=(), vn_fmt=None, **kwargs):
|
||||
assert vn_fmt is not None, 'vn_fmt is required'
|
||||
if vn_fmt is None:
|
||||
return False
|
||||
@@ -16,8 +17,8 @@ def set_verbose_name(task_wrapper, /, *args, vn_args=(), vn_fmt=None, **kwargs):
|
||||
kwargs['delay'] = task_wrapper.settings.get('delay') or int()
|
||||
result = task_wrapper.schedule(*args, **kwargs)
|
||||
try:
|
||||
task_history = TaskHistory.objects.get(task_id=str(result.id))
|
||||
except TaskHistory.DoesNotExist:
|
||||
task_history = cls.objects.get(task_id=str(result.id))
|
||||
except cls.DoesNotExist:
|
||||
pass
|
||||
else:
|
||||
task_history.verbose_name = str(vn_fmt).format(*vn_args)
|
||||
@@ -95,7 +96,7 @@ class TaskHistory(models.Model):
|
||||
|
||||
@classmethod
|
||||
def schedule(cls, task_wrapper, /, *args, vn_args=(), vn_fmt=None, **kwargs):
|
||||
return set_verbose_name(task_wrapper, *args, vn_fmt=vn_fmt, vn_args=vn_args, **kwargs)
|
||||
return set_verbose_name(cls, task_wrapper, *args, vn_fmt=vn_fmt, vn_args=vn_args, **kwargs)
|
||||
|
||||
def save(self, *args, **kwargs):
|
||||
self.queue = self.queue or None
|
||||
|
||||
Reference in new issue
Block a user