]> git.rkrishnan.org Git - tahoe-lafs/tahoe-lafs.git/blobdiff - src/allmydata/web/introweb.py
introducer: stop tracking hints for subscribed clients
[tahoe-lafs/tahoe-lafs.git] / src / allmydata / web / introweb.py
index 0fc456337aef840530a50d9fd881ef2ebf200d4a..bbe42d0bb9da1dbfd41b2b211d80ef377181eac0 100644 (file)
@@ -7,7 +7,8 @@ import allmydata
 import simplejson
 from allmydata import get_package_versions_string
 from allmydata.util import idlib
-from allmydata.web.common import getxmlfile, get_arg
+from allmydata.web.common import getxmlfile, get_arg, TIME_FORMAT
+
 
 class IntroducerRoot(rend.Page):
 
@@ -67,6 +68,8 @@ class IntroducerRoot(rend.Page):
         return simplejson.dumps(res, indent=1) + "\n"
 
     # FIXME: This code is duplicated in root.py and introweb.py.
+    def data_rendered_at(self, ctx, data):
+        return time.strftime(TIME_FORMAT, time.localtime())
     def data_version(self, ctx, data):
         return get_package_versions_string()
     def data_import_path(self, ctx, data):
@@ -115,8 +118,7 @@ class IntroducerRoot(rend.Page):
 
     def render_subscriber_row(self, ctx, s):
         ctx.fillSlots("nickname", s.nickname)
-        ctx.fillSlots("peerid", s.tubid)
-        ctx.fillSlots("advertised", " ".join(s.advertised_addresses))
+        ctx.fillSlots("tubid", s.tubid)
         ctx.fillSlots("connected", s.remote_address)
         since_s = time.strftime("%H:%M:%S %d-%b-%Y", time.localtime(s.when))
         ctx.fillSlots("since", since_s)