From: Brian Warner Date: Tue, 12 Jun 2012 21:37:27 +0000 (-0700) Subject: introweb: the Subscribed Clients list shows tubids, not serverids X-Git-Url: https://git.rkrishnan.org/simplejson/provisioning?a=commitdiff_plain;h=ef2db561040e392af71a51727bb7eff23d7b9b93;p=tahoe-lafs%2Ftahoe-lafs.git introweb: the Subscribed Clients list shows tubids, not serverids Improve the column headers to make it clear that this list shows Tub IDs. (we can't show pubkey-based serverids because clients don't give those to us: only servers provide pubkeys). This should be the only place in the whole webapi that shows TubIDs for modern (V2-introducer) nodes. --- diff --git a/src/allmydata/web/introducer.xhtml b/src/allmydata/web/introducer.xhtml index 06709864..6738a290 100644 --- a/src/allmydata/web/introducer.xhtml +++ b/src/allmydata/web/introducer.xhtml @@ -55,7 +55,7 @@
Nickname
-
PeerID
+
Tub ID
Advertised IPs Connected From Since @@ -65,14 +65,14 @@
-
+
- no peers! + no subscribers! diff --git a/src/allmydata/web/introweb.py b/src/allmydata/web/introweb.py index 0fc45633..843fd0e0 100644 --- a/src/allmydata/web/introweb.py +++ b/src/allmydata/web/introweb.py @@ -115,7 +115,7 @@ class IntroducerRoot(rend.Page): def render_subscriber_row(self, ctx, s): ctx.fillSlots("nickname", s.nickname) - ctx.fillSlots("peerid", s.tubid) + ctx.fillSlots("tubid", s.tubid) ctx.fillSlots("advertised", " ".join(s.advertised_addresses)) ctx.fillSlots("connected", s.remote_address) since_s = time.strftime("%H:%M:%S %d-%b-%Y", time.localtime(s.when))