Fix autoconnecting to the next host in the list if the selected one isn't available

This commit is contained in:
Andrew Resch 2009-11-13 05:22:38 +00:00
parent bdba9cd00a
commit 330b8b3ced
1 changed files with 5 additions and 5 deletions

View File

@ -309,10 +309,10 @@ Please see the details below for more information."), details=traceback.format_e
dialogs.ErrorDialog( dialogs.ErrorDialog(
_("Error Starting Daemon"), _("Error Starting Daemon"),
_("There was an error starting the daemon process. Try running it from a console to see if there is an error.")).run() _("There was an error starting the daemon process. Try running it from a console to see if there is an error.")).run()
# We'll try 30 reconnects at 500ms intervals # We'll try 30 reconnects at 500ms intervals
try_counter = 30 try_counter = 30
def on_connect(connector): def on_connect(connector):
component.start() component.start()
def on_connect_fail(result, try_counter): def on_connect_fail(result, try_counter):
@ -325,13 +325,13 @@ Please see the details below for more information."), details=traceback.format_e
time.sleep(0.5) time.sleep(0.5)
do_connect() do_connect()
return result return result
def do_connect(): def do_connect():
client.connect(*host[1:]).addCallback(on_connect).addErrback(on_connect_fail, try_counter) client.connect(*host[1:]).addCallback(on_connect).addErrback(on_connect_fail, try_counter)
if try_connect: if try_connect:
do_connect() do_connect()
break
if self.config["show_connection_manager_on_start"]: if self.config["show_connection_manager_on_start"]:
# XXX: We need to call a simulate() here, but this could be a bug in twisted # XXX: We need to call a simulate() here, but this could be a bug in twisted