]> git.rkrishnan.org Git - tahoe-lafs/tahoe-lafs.git/commitdiff
webish: show nickname too
authorBrian Warner <warner@allmydata.com>
Wed, 6 Feb 2008 01:26:05 +0000 (18:26 -0700)
committerBrian Warner <warner@allmydata.com>
Wed, 6 Feb 2008 01:26:05 +0000 (18:26 -0700)
src/allmydata/introducer.py
src/allmydata/web/welcome.xhtml
src/allmydata/webish.py

index 7519ec4ac28ef11d4bb5480dc917111d312cd4be..45168ad75524c0a0a29ff0f2c0b1c34b8638c672 100644 (file)
@@ -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)
index cf32acb877ada12b676a1a94d7400c373375f78a..ea3048cfd5a658b70587ac72e1beb168a996cbf6 100644 (file)
@@ -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>
index f4d426a860b449139e74217a8e9a7eeb99b0c366..bcbf6f6dd2d771d56c1d636430f9b418028ba53a 100644 (file)
@@ -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