ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-20 13:33:09 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

remove "announcement_distinct_hosts" from introweb JSON

Browse Source 
The machine-parseable JSON output for the introducer status web page
used to include a key named "announcement_distinct_hosts", which counted
the number of distinct IP addresses advertised by all connected storage
servers. This hasn't worked since Aug-2014 when foolscap-0.6.5 change
the internal hints format.

This removes that field.
This commit is contained in:
Brian Warner 2015-09-22 16:34:50 -07:00
parent 71323fbd8f
commit 8f0c417910
2 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/allmydata/test/test_system.py
View File

@ -812,8 +812,6 @@ class SystemTest(SystemTestMixin, RunBinTahoeMixin, unittest.TestCase):
{"storage": 5}) {"storage": 5})
self.failUnlessEqual(data["announcement_summary"], self.failUnlessEqual(data["announcement_summary"],
{"storage": 5}) {"storage": 5})
self.failUnlessEqual(data["announcement_distinct_hosts"],
{"storage": 1})
except unittest.FailTest: except unittest.FailTest:
print print
print "GET %s?t=json output was:" % self.introweb_url print "GET %s?t=json output was:" % self.introweb_url

16
src/allmydata/web/introweb.py
View File

@ -42,28 +42,12 @@ class IntroducerRoot(rend.Page):
res["subscription_summary"] = counts res["subscription_summary"] = counts
announcement_summary = {} announcement_summary = {}
service_hosts = {}
for ad in self.introducer_service.get_announcements(): for ad in self.introducer_service.get_announcements():
service_name = ad.service_name service_name = ad.service_name
if service_name not in announcement_summary: if service_name not in announcement_summary:
announcement_summary[service_name] = 0 announcement_summary[service_name] = 0
announcement_summary[service_name] += 1 announcement_summary[service_name] += 1
if service_name not in service_hosts:
service_hosts[service_name] = set()
# it's nice to know how many distinct hosts are available for
# each service. We define a "host" by a set of addresses
# (hostnames or ipv4 addresses), which we extract from the
# connection hints. In practice, this is usually close
# enough: when multiple services are run on a single host,
# they're usually either configured with the same addresses,
# or setLocationAutomatically picks up the same interfaces.
host = frozenset(ad.advertised_addresses)
service_hosts[service_name].add(host)
res["announcement_summary"] = announcement_summary res["announcement_summary"] = announcement_summary
distinct_hosts = dict([(name, len(hosts))
for (name, hosts)
in service_hosts.iteritems()])
res["announcement_distinct_hosts"] = distinct_hosts
return simplejson.dumps(res, indent=1) + "\n" return simplejson.dumps(res, indent=1) + "\n"