ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-02-20 17:52:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

apply zooko's advice: storage_client get_known_servers() returns a frozenset, caller sorts

Browse Source 
refs #1363
This commit is contained in:
Brian Warner 2011-08-01 10:44:52 -07:00
parent 0605c77f08
commit feca907499
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/allmydata/storage_client.py
View File

@ -124,16 +124,13 @@ class StorageFarmBroker:
return sorted(self.get_connected_servers(), key=_permuted)
def get_all_serverids(self):
serverids = set()
serverids.update(self.servers.keys())
return frozenset(serverids)
return frozenset(self.servers.keys())
def get_connected_servers(self):
return frozenset([s for s in self.get_known_servers()
if s.get_rref()])
return frozenset([s for s in self.servers.values() if s.get_rref()])
def get_known_servers(self):
return sorted(self.servers.values(), key=lambda s: s.get_serverid())
return frozenset(self.servers.values())
def get_nickname_for_serverid(self, serverid):
if serverid in self.servers:

2
src/allmydata/web/root.py
View File

@ -256,7 +256,7 @@ class Root(rend.Page):
def data_services(self, ctx, data):
sb = self.client.get_storage_broker()
return sb.get_known_servers()
return sorted(sb.get_known_servers(), key=lambda s: s.get_serverid())
def render_service_row(self, ctx, server):
nodeid = server.get_serverid()