Autogenerated documentation for github.

celery/bin/celeryd.py

@@ -63,6 +63,7 @@
 """
 import os
 import sys
+from carrot.connection import DjangoBrokerConnection
 from celery.loaders import current_loader
 from celery.loaders import settings
 from celery import __version__
@@ -84,7 +85,7 @@ settings.CELERY_STATISTICS = USE_STATISTICS
 
 STARTUP_INFO_FMT = """
 Configuration ->
-    * Broker -> amqp://%(vhost)s@%(host)s:%(port)s
+    * Broker -> %(carrot_backend)s://%(vhost)s@%(host)s:%(port)s
     * Exchange -> %(exchange)s (%(exchange_type)s)
     * Consumer -> Queue:%(consumer_queue)s Routing:%(consumer_rkey)s
     * Concurrency -> %(concurrency)s
@@ -179,10 +180,16 @@ def run_worker(concurrency=DAEMON_CONCURRENCY, detach=False,
 
     # Dump configuration to screen so we have some basic information
     # when users sends e-mails.
+    broker_connection = DjangoBrokerConnection()
+    carrot_backend = broker_connection.backend_cls
+    if not isinstance(carrot_backend, str):
+        carrot_backend = carrot_backend.__name__
+
     print(STARTUP_INFO_FMT % {
-            "vhost": getattr(settings, "AMQP_VHOST", "(default)"),
-            "host": getattr(settings, "AMQP_SERVER", "(default)"),
-            "port": getattr(settings, "AMQP_PORT", "(default)"),
+            "carrot_backend": broker_connection.backend_cls or "amqp",
+            "vhost": broker_connection.virtual_host or "(default)",
+            "host": broker_connection.hostname or "(default)",
+            "port": broker_connection.port or "(port)",
             "exchange": conf.AMQP_EXCHANGE,
             "exchange_type": conf.AMQP_EXCHANGE_TYPE,
             "consumer_queue": conf.AMQP_CONSUMER_QUEUE,
@@ -193,6 +200,7 @@ def run_worker(concurrency=DAEMON_CONCURRENCY, detach=False,
             "pidfile": pidfile,
             "statistics": settings.CELERY_STATISTICS and "ON" or "OFF",
     })
+    del(broker_connection)
 
     print("Celery has started.")
     if detach:

contrib/testconn.py

@@ -27,10 +27,10 @@ class MyMessager(Messaging):
 
 def _create_conn():
     from django.conf import settings
-    conn = amqp.Connection(host=settings.AMQP_SERVER,
-                           userid=settings.AMQP_USER,
-                           password=settings.AMQP_PASSWORD,
-                           virtual_host=settings.AMQP_VHOST,
+    conn = amqp.Connection(host=settings.BROKER_SERVER,
+                           userid=settings.BROKER_USER,
+                           password=settings.BROKER_PASSWORD,
+                           virtual_host=settings.BROKER_VHOST,
                            insist=False)
     return conn
 

testproj/settings.py

@@ -21,11 +21,11 @@ TEST_APPS = (
     "celery",
 )
 
-AMQP_SERVER = "localhost"
-AMQP_PORT = 5672
-AMQP_VHOST = "/"
-AMQP_USER = "guest"
-AMQP_PASSWORD = "guest"
+BROKER_HOST = "localhost"
+BROKER_PORT = 5672
+BROKER_VHOST = "/"
+BROKER_USER = "guest"
+BROKER_PASSWORD = "guest"
 
 TT_HOST = "localhost"
 TT_PORT = 1978