From: Daira Hopwood Date: Mon, 24 Aug 2015 16:41:57 +0000 (+0100) Subject: Rename Client.upload_ready_d to connected_enough_d. X-Git-Url: https://git.rkrishnan.org/running.html?a=commitdiff_plain;h=838a4260758637e3ee40b4b5ba0972f9503afbd0;p=tahoe-lafs%2Ftahoe-lafs.git Rename Client.upload_ready_d to connected_enough_d. Signed-off-by: Daira Hopwood --- diff --git a/src/allmydata/client.py b/src/allmydata/client.py index cd43ff83..77f37f00 100644 --- a/src/allmydata/client.py +++ b/src/allmydata/client.py @@ -130,7 +130,7 @@ class Client(node.Node, pollmixin.PollMixin): def __init__(self, basedir="."): node.Node.__init__(self, basedir) - self.upload_ready_d = defer.Deferred() + self.connected_enough_d = defer.Deferred() self.started_timestamp = time.time() self.logSource="Client" self.encoding_params = self.DEFAULT_ENCODING_PARAMETERS.copy() @@ -350,7 +350,7 @@ class Client(node.Node, pollmixin.PollMixin): self.encoding_params["happy"] + 1) sb = storage_client.StorageFarmBroker(self.tub, True, connection_threshold, - self.upload_ready_d) + self.connected_enough_d) self.storage_broker = sb # load static server specifications from tahoe.cfg, if any. @@ -514,7 +514,7 @@ class Client(node.Node, pollmixin.PollMixin): s.startService() # start processing the upload queue when we've connected to enough servers - self.upload_ready_d.addCallback(s.ready) + self.connected_enough_d.addCallback(s.ready) def _check_exit_trigger(self, exit_trigger_file): if os.path.exists(exit_trigger_file):