ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-29 17:28:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Load announcement cache if failure to connect to introducer

Browse Source
This commit is contained in:
David Stainton 2016-05-11 09:22:47 +00:00 committed by Brian Warner
parent cfb939aa99
commit 5508f751b6
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/allmydata/introducer/client.py
View File

@ -111,9 +111,29 @@ class IntroducerClient(service.Service, Referenceable):
def connect_failed(failure):
self.log("Initial Introducer connection failed: perhaps it's down",
level=log.WEIRD, failure=failure, umid="c5MqUQ")
self._load_announcements()
d = self._tub.getReference(self.introducer_furl)
d.addErrback(connect_failed)
def _load_announcements(self):
if self._cache_filepath.exists():
with self._cache_filepath.open() as f:
servers = yaml.load(f)
f.close()
if not isinstance(servers, list):
msg = "Invalid cached storage server announcements. No list encountered."
self.log(msg,
level=log.WEIRD)
raise storage_client.UnknownServerTypeError(msg)
for server_params in servers:
if not isinstance(server_params, dict):
msg = "Invalid cached storage server announcement encountered. No key/values found in %s" % server_params
self.log(msg,
level=log.WEIRD)
raise storage_client.UnknownServerTypeError(msg)
for _, cb, _, _ in self._local_subscribers:
eventually(cb, server_params['key_s'], server_params['ann'])
def _save_announcements(self):
announcements = []
for _, value in self._inbound_announcements.items():