fork/django-q2
1
0
Fork 0
mirror of https://github.com/django-q2/django-q2.git synced 2026-10-09 05:28:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Change imports signing classes explicit

Browse Source
This commit is contained in:
Eagllus
2018-03-13 09:22:09 +01:00
parent ae9392137c
commit 9c39546417
3 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
django_q/cluster.py
+6 -6
View File
@@ -21,12 +21,12 @@ from django.utils.translation import ugettext_lazy as _
from django import db
# Local
import signing
import tasks
from django_q.compat import range
from django_q.conf import Conf, logger, psutil, get_ppid, error_reporter, rollbar
from django_q.models import Task, Success, Schedule
from django_q.signing import SignedPackage, BadSignature
from django_q.status import Stat, Status
from django_q.brokers import get_broker
from django_q.signals import pre_execute
@@ -297,8 +297,8 @@ def pusher(task_queue, event, broker=None):
ack_id = task[0]
# unpack the task
try:
task = signing.SignedPackage.loads(task[1])
except (TypeError, signing.BadSignature) as e:
task = SignedPackage.loads(task[1])
except (TypeError, BadSignature) as e:
logger.error(e)
broker.fail(ack_id)
continue
@@ -456,11 +456,11 @@ def save_cached(task, broker):
if iter_count and len(group_list) == iter_count - 1:
group_args = '{}:{}:args'.format(broker.list_key, group)
# collate the results into a Task result
results = [signing.SignedPackage.loads(broker.cache.get(k))['result'] for k in group_list]
results = [SignedPackage.loads(broker.cache.get(k))['result'] for k in group_list]
results.append(task['result'])
task['result'] = results
task['id'] = group
task['args'] = signing.SignedPackage.loads(broker.cache.get(group_args))
task['args'] = SignedPackage.loads(broker.cache.get(group_args))
task.pop('iter_count', None)
task.pop('group', None)
if task.get('iter_cached', None):
@@ -479,7 +479,7 @@ def save_cached(task, broker):
tasks.async_chain(task['chain'], group=group, cached=task['cached'], sync=task['sync'], broker=broker)
# save the task
broker.cache.set(task_key,
signing.SignedPackage.dumps(task),
SignedPackage.dumps(task),
timeout)
except Exception as e:
logger.error(e)