matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Initial commit to support Celery 4.3.0

Browse Source 
Merges 55e9b2263c from versions/next
with code from GitLab issue #594 and GitLab merge request !55.

Thanks to Jakob Haufe (@sur5r) and Jesaja Everling (@jeverling)
for much of the research and code updates.

Signed-off-by: Roberto Rosario <roberto.rosario@mayan-edms.com>
This commit is contained in:
Roberto Rosario
2019-07-17 04:30:11 -04:00
parent 0b42567179
commit ab601f9180
23 changed files with 119 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mayan/apps/task_manager/classes.py
View File

@@ -156,13 +156,13 @@ class CeleryQueue(object):
if self.transient:
kwargs['delivery_mode'] = 1
celery_app.conf.CELERY_QUEUES.append(Queue(**kwargs))
celery_app.conf.task_queues.append(Queue(**kwargs))
if self.default_queue:
celery_app.conf.CELERY_DEFAULT_QUEUE = self.name
celery_app.conf.task_default_queue = self.name
for task_type in self.task_types:
celery_app.conf.CELERY_ROUTES.update(
celery_app.conf.task_routes.update(
{
task_type.dotted_path: {
'queue': self.name
@@ -171,7 +171,7 @@ class CeleryQueue(object):
)
if task_type.schedule:
celery_app.conf.CELERYBEAT_SCHEDULE.update(
celery_app.conf.beat_schedule.update(
{
task_type.name: {
'task': task_type.dotted_path,

2
mayan/apps/task_manager/settings.py
View File

@@ -10,7 +10,7 @@ __all__ = ()
namespace = Namespace(label=_('Celery'), name='celery')
setting_celery_broker_url = namespace.add_setting(
global_name='BROKER_URL', default=None,
global_name='CELERY_BROKER_URL', default=None,
help_text=_(
'Default: "amqp://". Default broker URL. This must be a URL in '
'the form of: transport://userid:password@hostname:port/virtual_host '