Skip to content
This repository has been archived by the owner on Sep 23, 2020. It is now read-only.

Commit

Permalink
Make parameter override config value.
Browse files Browse the repository at this point in the history
Also remove a debug statement
  • Loading branch information
oldpatricka committed Jan 17, 2013
1 parent f2e1eb7 commit 9898437
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions dashi/bootstrap/__init__.py
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -110,9 +110,11 @@ def dashi_connect(topic, CFG=None, amqp_uri=None, sysname=None):
try: try:
_sysname = CFG.dashi.sysname _sysname = CFG.dashi.sysname
except AttributeError: except AttributeError:
_sysname = sysname _sysname = None


print "PDA: sysname -> %s" % _sysname # argument overrides config value
if sysname is not None:
_sysname = sysname


return DashiConnection(topic, amqp_uri, dashi_exchange, return DashiConnection(topic, amqp_uri, dashi_exchange,
serializer=serializer, transport_options=transport_options, ssl=ssl, serializer=serializer, transport_options=transport_options, ssl=ssl,
Expand Down

0 comments on commit 9898437

Please sign in to comment.