Merge branch 'philip/notify-queue-setting' into 'master'
Enable api level setting of queue value. See merge request grassrootseconomics/cic-internal-integration!184
This commit is contained in:
commit
53317cb912
@ -26,7 +26,7 @@ def get_sms_queue_tasks(app, task_prefix='cic_notify.tasks.sms.'):
|
|||||||
for q in qs[host]:
|
for q in qs[host]:
|
||||||
if re.match(re_q, q['name']):
|
if re.match(re_q, q['name']):
|
||||||
host_queues.append((host, q['name'],))
|
host_queues.append((host, q['name'],))
|
||||||
|
|
||||||
task_prefix_len = len(task_prefix)
|
task_prefix_len = len(task_prefix)
|
||||||
queue_tasks = []
|
queue_tasks = []
|
||||||
for (host, queue) in host_queues:
|
for (host, queue) in host_queues:
|
||||||
@ -35,17 +35,18 @@ def get_sms_queue_tasks(app, task_prefix='cic_notify.tasks.sms.'):
|
|||||||
for task in tasks:
|
for task in tasks:
|
||||||
if len(task) >= task_prefix_len and task[:task_prefix_len] == task_prefix:
|
if len(task) >= task_prefix_len and task[:task_prefix_len] == task_prefix:
|
||||||
queue_tasks.append((queue, task,))
|
queue_tasks.append((queue, task,))
|
||||||
|
|
||||||
return queue_tasks
|
return queue_tasks
|
||||||
|
|
||||||
|
|
||||||
class Api:
|
class Api:
|
||||||
# TODO: Implement callback strategy
|
# TODO: Implement callback strategy
|
||||||
def __init__(self, queue='cic-notify'):
|
def __init__(self, queue=None):
|
||||||
"""
|
"""
|
||||||
:param queue: The queue on which to execute notification tasks
|
:param queue: The queue on which to execute notification tasks
|
||||||
:type queue: str
|
:type queue: str
|
||||||
"""
|
"""
|
||||||
|
self.queue = queue
|
||||||
self.sms_tasks = get_sms_queue_tasks(app)
|
self.sms_tasks = get_sms_queue_tasks(app)
|
||||||
logg.debug('sms tasks {}'.format(self.sms_tasks))
|
logg.debug('sms tasks {}'.format(self.sms_tasks))
|
||||||
|
|
||||||
@ -61,13 +62,19 @@ class Api:
|
|||||||
"""
|
"""
|
||||||
signatures = []
|
signatures = []
|
||||||
for q in self.sms_tasks:
|
for q in self.sms_tasks:
|
||||||
|
|
||||||
|
if not self.queue:
|
||||||
|
queue = q[0]
|
||||||
|
else:
|
||||||
|
queue = self.queue
|
||||||
|
|
||||||
signature = celery.signature(
|
signature = celery.signature(
|
||||||
q[1],
|
q[1],
|
||||||
[
|
[
|
||||||
message,
|
message,
|
||||||
recipient,
|
recipient,
|
||||||
],
|
],
|
||||||
queue=q[0],
|
queue=queue,
|
||||||
)
|
)
|
||||||
signatures.append(signature)
|
signatures.append(signature)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user