diff options
| author | Fernando Gutierrez <fergtm@nil.mx> | 2020-05-12 12:25:10 +1000 |
|---|---|---|
| committer | Ben Sturmfels <ben@sturm.com.au> | 2020-05-12 12:30:35 +1000 |
| commit | 243354b65e1c2793f12d01d8174e9a168eb01ecd (patch) | |
| tree | 8a6a60a2497d9c38d8216ed16ffd5397267985a1 | |
| parent | 3d0c2a773b0ae7e8422b89dc9de349d797ada026 (diff) | |
| download | mediagoblin-243354b65e1c2793f12d01d8174e9a168eb01ecd.tar.lz mediagoblin-243354b65e1c2793f12d01d8174e9a168eb01ecd.tar.xz mediagoblin-243354b65e1c2793f12d01d8174e9a168eb01ecd.zip | |
Avoid Celery/RabbitMQ "connection reset" errors [#5609].
This change starts Celery only after RabbitMQ is available. It also returns the
unnecessarily low BROKER_HEARTBEAT setting to default of 120.0 to help prevent
connections being reset on machines under load.
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | docs/source/siteadmin/deploying.rst | 1 | ||||
| -rw-r--r-- | mediagoblin/init/celery/__init__.py | 1 |
3 files changed, 2 insertions, 1 deletions
@@ -45,6 +45,7 @@ Thank you! * Duncan Paterson * Elrond of Samba TNG * Emily O'Leary +* Fernando Gutierrez * Gabi Thume * Gabriel Saldana * Greg Grossmeier diff --git a/docs/source/siteadmin/deploying.rst b/docs/source/siteadmin/deploying.rst index 41e67c31..e3780325 100644 --- a/docs/source/siteadmin/deploying.rst +++ b/docs/source/siteadmin/deploying.rst @@ -528,6 +528,7 @@ environment's setup: # Set the WorkingDirectory and Environment values to match your environment. [Unit] Description=MediaGoblin Celeryd + After=rabbitmq-server.service [Service] User=mediagoblin diff --git a/mediagoblin/init/celery/__init__.py b/mediagoblin/init/celery/__init__.py index 9a67942c..9fb783bd 100644 --- a/mediagoblin/init/celery/__init__.py +++ b/mediagoblin/init/celery/__init__.py @@ -81,7 +81,6 @@ def get_celery_settings_dict(app_config, global_config, 'schedule': datetime.timedelta(minutes=frequency), } } - celery_settings['BROKER_HEARTBEAT'] = 1 return celery_settings |