Fixes for broker_connection()

kevin1024 · Sep 19, 2011 · 62066c2 · 62066c2
1 parent 85234a7
commit 62066c2
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/celery/app/base.py b/celery/app/base.py
@@ -263,6 +263,7 @@ def broker_connection(self, url=None, *args, **kwargs):
         #
         #        Using kombu URLs, this should be allowed.
         #
+        args = list(args)
         conf = self.conf
         brokers = conf.BROKERS
         alias = conf.BROKER_DEFAULT
@@ -274,8 +275,10 @@ def broker_connection(self, url=None, *args, **kwargs):
                     alias = url
                 else:
                     args.insert(0, url)
-        return self.amqp.BrokerConnection(*args,
-                                          **dict(brokers[alias], **kwargs))
+        kwargs = dict(brokers[alias], **kwargs)
+        if args:
+            kwargs.pop("hostname", None)
+        return self.amqp.BrokerConnection(*args, **kwargs)
 
     @contextmanager
     def connection_or_acquire(self, connection=None):