Rooba
/
kombu
mirror of https://github.com/celery/kombu.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.5' 

Conflicts:
	kombu/transport/mongodb.py
This commit is contained in:
Ask Solem 2013-05-14 15:29:48 +01:00
parent b64251a6a8 7f9674419b
commit 415dcc5ff8
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -43,6 +43,7 @@ James Turk <james.p.turk@gmail.com>
Jason Cater <jason@ncsfulfillment.com>
Jasper Bryant-Greene <jbg@rf.net.nz>
Jeff Balogh <me@jeffbalogh.org>
John Shuping <jshuping@acm.org>
John Spray <jcspray@gmail.com>
John Watson <john@disqus.com>
Jonathan Halcrow <jonathan.halcrow@gmail.com>

13
kombu/connection.py
View File

@ -545,12 +545,9 @@ class Connection(object):
transport_cls = RESOLVE_ALIASES.get(transport_cls, transport_cls)
D = self.transport.default_connection_params
if self.alt:
hostname = ";".join(self.alt)
else:
hostname = self.hostname or D.get('hostname')
if self.uri_prefix:
hostname = '%s+%s' % (self.uri_prefix, hostname)
hostname = self.hostname or D.get('hostname')
if self.uri_prefix:
hostname = '%s+%s' % (self.uri_prefix, hostname)
info = (('hostname', hostname),
('userid', self.userid or D.get('userid')),
@ -565,6 +562,10 @@ class Connection(object):
('login_method', self.login_method or D.get('login_method')),
('uri_prefix', self.uri_prefix),
('heartbeat', self.heartbeat))
if self.alt:
info += (('alternates', self.alt),)
return info
def info(self):