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.

AUTHORS

@@ -45,6 +45,7 @@ Thank you!
 * Duncan Paterson
 * Elrond of Samba TNG
 * Emily O'Leary
+* Fernando Gutierrez
 * Gabi Thume
 * Gabriel Saldana
 * Greg Grossmeier

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

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