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

remove prints

Browse Source
This commit is contained in:
meejah 2018-12-07 16:01:06 -07:00
parent 3c679e9202
commit 7b5783536b
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/allmydata/storage_client.py
View File

@ -223,7 +223,7 @@ class StorageFarmBroker(service.MultiService):
connected_servers = self.get_connected_servers() connected_servers = self.get_connected_servers()
preferred_servers = frozenset(s for s in connected_servers if s.get_longname() in self.preferred_peers) preferred_servers = frozenset(s for s in connected_servers if s.get_longname() in self.preferred_peers)
if for_upload: if for_upload:
print("upload processing: {}".format([srv.upload_permitted() for srv in connected_servers])) # print("upload processing: {}".format([srv.upload_permitted() for srv in connected_servers]))
connected_servers = [ connected_servers = [
srv srv
for srv in connected_servers for srv in connected_servers
@ -409,26 +409,24 @@ class NativeStorageServer(service.MultiService):
:return: True if we should use this server for uploads, False :return: True if we should use this server for uploads, False
otherwise. otherwise.
""" """
print("upload permitted? {}".format(self._server_id)) # print("upload permitted? {}".format(self._server_id))
# if we have no Grid Manager keys configured, choice is easy # if we have no Grid Manager keys configured, choice is easy
if not self._grid_manager_keys: if not self._grid_manager_keys:
print("{} no grid manager keys at all (so yes)".format(self._server_id)) # print("{} no grid manager keys at all (so yes)".format(self._server_id))
return True return True
# XXX probably want to cache the answer to this? (ignoring # XXX probably want to cache the answer to this? (ignoring
# that for now because certificates expire, so .. slightly # that for now because certificates expire, so .. slightly
# more complex) # more complex)
if not self._grid_manager_certificates: if not self._grid_manager_certificates:
print("{} no grid-manager certificates {} (so no)".format(self._server_id, self._grid_manager_certificates)) # print("{} no grid-manager certificates {} (so no)".format(self._server_id, self._grid_manager_certificates))
return False return False
for gm_key in self._grid_manager_keys: for gm_key in self._grid_manager_keys:
for cert in self._grid_manager_certificates: for cert in self._grid_manager_certificates:
if _validate_grid_manager_certificate(gm_key, cert): if _validate_grid_manager_certificate(gm_key, cert):
print("valid: {}\n{}".format(gm_key, cert)) # print("valid: {}\n{}".format(gm_key, cert))
return True return True
else: # print("didn't validate {} keys".format(len(self._grid_manager_keys)))
print("invalid: {}\n{}".format(gm_key, cert))
print("didn't validate {} keys".format(len(self._grid_manager_keys)))
return False return False