Rename upload_ready_d to connected_enough_d.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
Daira Hopwood 2015-09-16 14:28:46 +01:00
parent 00159ecd06
commit 2b17d88644

View File

@ -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.
@ -511,7 +511,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,))