Browse Source

Make startup work with carrot backends that doesn't have certain AMQP
connection settings.

Ask Solem 15 years ago
parent
commit
d8ae4b1c15
2 changed files with 4 additions and 3 deletions
  1. 3 3
      celery/bin/celeryd.py
  2. 1 0
      celery/messaging.py

+ 3 - 3
celery/bin/celeryd.py

@@ -215,9 +215,9 @@ def run_worker(concurrency=DAEMON_CONCURRENCY, detach=False,
     # Dump configuration to screen so we have some basic information
     # when users sends e-mails.
     print(STARTUP_INFO_FMT % {
-            "vhost": settings.AMQP_VHOST,
-            "host": settings.AMQP_SERVER,
-            "port": settings.AMQP_PORT,
+            "vhost": getattr(settings, "AMQP_VHOST", "(default)"),
+            "host": getattr(settings, "AMQP_SERVER", "(default)"),
+            "port": getattr(settings, "AMQP_PORT", "(default)"),
             "exchange": conf.AMQP_EXCHANGE,
             "exchange_type": conf.AMQP_EXCHANGE_TYPE,
             "consumer_queue": conf.AMQP_CONSUMER_QUEUE,

+ 1 - 0
celery/messaging.py

@@ -57,6 +57,7 @@ class TaskPublisher(Publisher):
             "retries": kwargs.get("retries", 0),
             "eta": kwargs.get("eta"),
         }
+
         if part_of_set:
             message_data["taskset"] = part_of_set