From: Brian Warner <warner@allmydata.com>
Date: Wed, 6 Feb 2008 01:26:05 +0000 (-0700)
Subject: webish: show nickname too
X-Git-Tag: allmydata-tahoe-0.8.0~147
X-Git-Url: https://git.rkrishnan.org/CLI.txt?a=commitdiff_plain;h=96e6c78c7a86b5db21a878b8634732de6100126f;p=tahoe-lafs%2Ftahoe-lafs.git

webish: show nickname too
---

diff --git a/src/allmydata/introducer.py b/src/allmydata/introducer.py
index 7519ec4a..45168ad7 100644
--- a/src/allmydata/introducer.py
+++ b/src/allmydata/introducer.py
@@ -93,8 +93,9 @@ class RemoteServiceConnector:
     @ivar last_connect_time: when we last established a connection
     @ivar last_loss_time: when we last lost a connection
 
-    @ivar version: the peer's version, from the most recent connection
+    @ivar version: the peer's version, from the most recent announcement
     @ivar oldest_supported: the peer's oldest supported version, same
+    @ivar nickname: the peer's self-reported nickname, same
 
     @ivar rref: the RemoteReference, if connected, otherwise None
     @ivar remote_host: the IAddress, if connected, otherwise None
@@ -123,6 +124,7 @@ class RemoteServiceConnector:
         self.last_connect_time = None
         self.version = ver
         self.oldest_supported = oldest
+        self.nickname = nickname
 
     def log(self, *args, **kwargs):
         return self._ic.log(*args, **kwargs)
diff --git a/src/allmydata/web/welcome.xhtml b/src/allmydata/web/welcome.xhtml
index cf32acb8..ea3048cf 100644
--- a/src/allmydata/web/welcome.xhtml
+++ b/src/allmydata/web/welcome.xhtml
@@ -32,6 +32,7 @@ tool</a> may also be useful.</div>
 <table n:render="sequence" n:data="services" border="1">
   <tr n:pattern="header">
     <td>PeerID</td>
+    <td>Nickname</td>
     <td>Connected?</td>
     <td>Since</td>
     <td>Announced</td>
@@ -40,6 +41,7 @@ tool</a> may also be useful.</div>
   </tr>
   <tr n:pattern="item" n:render="service_row">
     <td><tt><n:slot name="peerid"/></tt></td>
+    <td><tt><n:slot name="nickname"/></tt></td>
     <td><tt><n:slot name="connected"/></tt></td>
     <td><tt><n:slot name="since"/></tt></td>
     <td><tt><n:slot name="announced"/></tt></td>
diff --git a/src/allmydata/webish.py b/src/allmydata/webish.py
index f4d426a8..bcbf6f6d 100644
--- a/src/allmydata/webish.py
+++ b/src/allmydata/webish.py
@@ -1381,6 +1381,7 @@ class Root(rend.Page):
                                                  time.localtime(rsc.announcement_time)))
         ctx.fillSlots("version", rsc.version)
         ctx.fillSlots("service_name", rsc.service_name)
+        ctx.fillSlots("nickname", rsc.nickname)
 
         return ctx.tag