kallithea Changeset - 66670aff96c5

Changeset - 66670aff96c5

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Mads Kiilerich - 6 years ago 2020-02-18 17:03:09
mads@kiilerich.com

Grafted from: 462c8245e9e4

celery: set default config values in code and remove them from the generated .ini

It is hard to imagine any reason the user should change celery.imports . And if
it ever should change, we want it controlled in code - not left stale in user
controlled config files.

Everybody sould just use .json and there is no reason anybody should specify
that in the .ini ... and it will be the default in Celery 4.

3 files changed with 7 insertions and 14 deletions:

development.ini

kallithea/lib/celerypylons/__init__.py

kallithea/lib/paster_commands/template.ini.mako

0 comments (0 inline, 0 general)

development.ini

➞

Show inline comments

@@ @@ -255,11 +255,7 @@ use_celery = false @@
 ## Example: connect to the virtual host 'rabbitmqhost' on localhost as rabbitmq:
 broker.url = amqp://rabbitmq:qewqew@localhost:5672/rabbitmqhost
 celery.imports = kallithea.lib.celerylib.tasks
 celery.accept.content = json
 celery.result.backend = amqp://
 celery.result.serializer = json
 celery.task.serializer = json
 #celery.send.task.error.emails = true
 #celery.amqp.task.result.expires = 18000

kallithea/lib/celerypylons/__init__.py

➞

Show inline comments

@@ @@ -18,15 +18,16 @@ import celery @@
 import tg
 class CeleryConfig(object):
     CELERY_IMPORTS = ['kallithea.lib.celerylib.tasks']
     CELERY_ACCEPT_CONTENT = ['json']
     CELERY_RESULT_SERIALIZER = 'json'
     CELERY_TASK_SERIALIZER = 'json'
 def celery_config(config):
     """Return Celery config object populated from relevant settings in a config dict, such as tg.config"""
     # Verify .ini file configuration has been loaded
     assert config['celery.imports'] == 'kallithea.lib.celerylib.tasks', 'Kallithea Celery configuration has not been loaded'
     class CeleryConfig(object):
         pass
     celery_config = CeleryConfig()
     PREFIXES = """ADMINS BROKER CASSANDRA CELERYBEAT CELERYD CELERYMON CELERY EMAIL SERVER""".split()

kallithea/lib/paster_commands/template.ini.mako

➞

Show inline comments

@@ @@ -361,11 +361,7 @@ use_celery = false @@
 <%text>## Example: connect to the virtual host 'rabbitmqhost' on localhost as rabbitmq:</%text>
 broker.url = amqp://rabbitmq:qewqew@localhost:5672/rabbitmqhost
 celery.imports = kallithea.lib.celerylib.tasks
 celery.accept.content = json
 celery.result.backend = amqp://
 celery.result.serializer = json
 celery.task.serializer = json
 #celery.send.task.error.emails = true
 #celery.amqp.task.result.expires = 18000

0 comments (0 inline, 0 general)