From: Daira Hopwood Date: Wed, 16 Sep 2015 13:28:46 +0000 (+0100) Subject: Rename upload_ready_d to connected_enough_d. X-Git-Url: https://git.rkrishnan.org/%5B/%5D%20/uri/reedownlee?a=commitdiff_plain;h=48e41b9dc0627b851d6c6c881825a9b2a7f9f9ad;p=tahoe-lafs%2Ftahoe-lafs.git Rename 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 0a6c1eb6..1adc1d17 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() @@ -352,7 +352,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, preferred_peers=preferred_peers) + self.connected_enough_d, preferred_peers=preferred_peers) self.storage_broker = sb # load static server specifications from tahoe.cfg, if any. @@ -513,7 +513,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.upload_ready) + self.connected_enough_d.addCallback(s.ready) except Exception, e: self.log("couldn't start drop-uploader: %r", args=(e,))