-import time
+import time, os
from nevow import rend, inevow
-from foolscap.referenceable import SturdyRef
-from twisted.internet import address
+from nevow.static import File as nevow_File
+from nevow.util import resource_filename
import allmydata
import simplejson
from allmydata import get_package_versions_string
from allmydata.util import idlib
-from common import getxmlfile, get_arg, IClient
+from allmydata.web.common import getxmlfile, get_arg, TIME_FORMAT
+
class IntroducerRoot(rend.Page):
addSlash = True
docFactory = getxmlfile("introducer.xhtml")
+ child_operations = None
+
+ def __init__(self, introducer_node):
+ self.introducer_node = introducer_node
+ self.introducer_service = introducer_node.getServiceNamed("introducer")
+ rend.Page.__init__(self, introducer_node)
+ static_dir = resource_filename("allmydata.web", "static")
+ for filen in os.listdir(static_dir):
+ self.putChild(filen, nevow_File(os.path.join(static_dir, filen)))
+
def renderHTTP(self, ctx):
t = get_arg(inevow.IRequest(ctx), "t")
if t == "json":
return rend.Page.renderHTTP(self, ctx)
def render_JSON(self, ctx):
- i = IClient(ctx).getServiceNamed("introducer")
res = {}
- clients = i.get_subscribers()
- subscription_summary = dict([ (name, len(clients[name]))
- for name in clients ])
- res["subscription_summary"] = subscription_summary
+
+ counts = {}
+ for s in self.introducer_service.get_subscribers():
+ if s.service_name not in counts:
+ counts[s.service_name] = 0
+ counts[s.service_name] += 1
+ res["subscription_summary"] = counts
announcement_summary = {}
- for (ann,when) in i.get_announcements().values():
- (furl, service_name, ri_name, nickname, ver, oldest) = ann
+ for ad in self.introducer_service.get_announcements():
+ service_name = ad.service_name
if service_name not in announcement_summary:
announcement_summary[service_name] = 0
announcement_summary[service_name] += 1
res["announcement_summary"] = announcement_summary
- return simplejson.dumps(res, indent=1)
+ 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):
- return str(allmydata)
+ return str(allmydata).replace("/", "/ ") # XXX kludge for wrapping
def data_my_nodeid(self, ctx, data):
- return idlib.nodeid_b2a(IClient(ctx).nodeid)
+ return idlib.nodeid_b2a(self.introducer_node.nodeid)
def render_announcement_summary(self, ctx, data):
- i = IClient(ctx).getServiceNamed("introducer")
services = {}
- for (ann,when) in i.get_announcements().values():
- (furl, service_name, ri_name, nickname, ver, oldest) = ann
- if service_name not in services:
- services[service_name] = 0
- services[service_name] += 1
+ for ad in self.introducer_service.get_announcements():
+ if ad.service_name not in services:
+ services[ad.service_name] = 0
+ services[ad.service_name] += 1
service_names = services.keys()
service_names.sort()
return ", ".join(["%s: %d" % (service_name, services[service_name])
for service_name in service_names])
def render_client_summary(self, ctx, data):
- i = IClient(ctx).getServiceNamed("introducer")
- clients = i.get_subscribers()
- service_names = clients.keys()
- service_names.sort()
- return ", ".join(["%s: %d" % (service_name, len(clients[service_name]))
- for service_name in service_names])
+ counts = {}
+ for s in self.introducer_service.get_subscribers():
+ if s.service_name not in counts:
+ counts[s.service_name] = 0
+ counts[s.service_name] += 1
+ return ", ".join([ "%s: %d" % (name, counts[name])
+ for name in sorted(counts.keys()) ] )
def data_services(self, ctx, data):
- i = IClient(ctx).getServiceNamed("introducer")
- ann = [(since,a)
- for (a,since) in i.get_announcements().values()
- if a[1] != "stub_client"]
- ann.sort(lambda a,b: cmp( (a[1][1], a), (b[1][1], b) ) )
- return ann
-
- def render_service_row(self, ctx, (since,announcement)):
- (furl, service_name, ri_name, nickname, ver, oldest) = announcement
- sr = SturdyRef(furl)
- nodeid = sr.tubID
- advertised = [loc.split(":")[0] for loc in sr.locationHints
- if not loc.startswith("127.0.0.1:")]
- ctx.fillSlots("peerid", "%s %s" % (nodeid, nickname))
- ctx.fillSlots("advertised", " ".join(advertised))
+ services = self.introducer_service.get_announcements(False)
+ services.sort(key=lambda ad: (ad.service_name, ad.nickname))
+ return services
+
+ def render_service_row(self, ctx, ad):
+ ctx.fillSlots("serverid", ad.serverid)
+ ctx.fillSlots("nickname", ad.nickname)
+ ctx.fillSlots("advertised", " ".join(ad.advertised_addresses))
ctx.fillSlots("connected", "?")
- TIME_FORMAT = "%H:%M:%S %d-%b-%Y"
- ctx.fillSlots("announced",
- time.strftime(TIME_FORMAT, time.localtime(since)))
- ctx.fillSlots("version", ver)
- ctx.fillSlots("service_name", service_name)
+ when_s = time.strftime("%H:%M:%S %d-%b-%Y", time.localtime(ad.when))
+ ctx.fillSlots("announced", when_s)
+ ctx.fillSlots("version", ad.version)
+ ctx.fillSlots("service_name", ad.service_name)
return ctx.tag
def data_subscribers(self, ctx, data):
- i = IClient(ctx).getServiceNamed("introducer")
- # use the "stub_client" announcements to get information per nodeid
- clients = {}
- for (ann,when) in i.get_announcements().values():
- if ann[1] != "stub_client":
- continue
- (furl, service_name, ri_name, nickname, ver, oldest) = ann
- sr = SturdyRef(furl)
- nodeid = sr.tubID
- clients[nodeid] = ann
-
- # then we actually provide information per subscriber
- s = []
- for service_name, subscribers in i.get_subscribers().items():
- for (rref, timestamp) in subscribers.items():
- sr = rref.getSturdyRef()
- nodeid = sr.tubID
- ann = clients.get(nodeid)
- s.append( (service_name, rref, timestamp, ann) )
- s.sort()
- return s
+ return self.introducer_service.get_subscribers()
def render_subscriber_row(self, ctx, s):
- (service_name, rref, since, ann) = s
- nickname = "?"
- version = "?"
- if ann:
- (furl, service_name_2, ri_name, nickname, version, oldest) = ann
-
- sr = rref.getSturdyRef()
- # if the subscriber didn't do Tub.setLocation, nodeid will be None
- nodeid = sr.tubID or "?"
- ctx.fillSlots("peerid", "%s %s" % (nodeid, nickname))
- advertised = [loc.split(":")[0] for loc in sr.locationHints
- if not loc.startswith("127.0.0.1:")]
- ctx.fillSlots("advertised", " ".join(advertised))
- remote_host = rref.tracker.broker.transport.getPeer()
- if isinstance(remote_host, address.IPv4Address):
- remote_host_s = "%s:%d" % (remote_host.host, remote_host.port)
- else:
- # loopback is a non-IPv4Address
- remote_host_s = str(remote_host)
- ctx.fillSlots("connected", remote_host_s)
- TIME_FORMAT = "%H:%M:%S %d-%b-%Y"
- ctx.fillSlots("since",
- time.strftime(TIME_FORMAT, time.localtime(since)))
- ctx.fillSlots("version", version)
- ctx.fillSlots("service_name", service_name)
+ ctx.fillSlots("nickname", s.nickname)
+ 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)
+ ctx.fillSlots("version", s.version)
+ ctx.fillSlots("service_name", s.service_name)
return ctx.tag
-
projects / tahoe-lafs / tahoe-lafs.git / blobdiff