From 73a54f83d127d48bb0543aee435afc85ac363845 Mon Sep 17 00:00:00 2001 From: Brian Warner Date: Sat, 26 Feb 2011 19:11:59 -0700 Subject: [PATCH] web: remove some uses of s.get_serverid(), not all --- src/allmydata/web/check_results.py | 14 +++++++------- src/allmydata/web/root.py | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/allmydata/web/check_results.py b/src/allmydata/web/check_results.py index 44d05062..79857667 100644 --- a/src/allmydata/web/check_results.py +++ b/src/allmydata/web/check_results.py @@ -139,19 +139,19 @@ class ResultsBase: # this table is sorted by permuted order sb = c.get_storage_broker() - permuted_peer_ids = [s.get_serverid() - for s - in sb.get_servers_for_psi(cr.get_storage_index())] + permuted_servers = [s + for s + in sb.get_servers_for_psi(cr.get_storage_index())] num_shares_left = sum([len(shares) for shares in servers.values()]) servermap = [] - for serverid in permuted_peer_ids: - nickname = sb.get_nickname_for_serverid(serverid) - shareids = servers.get(serverid, []) + for s in permuted_servers: + nickname = s.get_nickname() + shareids = servers.get(s.get_serverid(), []) shareids.reverse() shareids_s = [ T.tt[shareid, " "] for shareid in sorted(shareids) ] servermap.append(T.tr[T.td[T.div(class_="nickname")[nickname], - T.div(class_="nodeid")[T.tt[base32.b2a(serverid)]]], + T.div(class_="nodeid")[T.tt[s.name()]]], T.td[shareids_s], ]) num_shares_left -= len(shareids) diff --git a/src/allmydata/web/root.py b/src/allmydata/web/root.py index 2f1f6d4f..fc17dc3a 100644 --- a/src/allmydata/web/root.py +++ b/src/allmydata/web/root.py @@ -256,7 +256,7 @@ class Root(rend.Page): def render_service_row(self, ctx, server): nodeid = server.get_serverid() - ctx.fillSlots("peerid", idlib.nodeid_b2a(nodeid)) + ctx.fillSlots("peerid", server.longname()) ctx.fillSlots("nickname", server.get_nickname()) rhost = server.get_remote_host() if rhost: -- 2.45.2