ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-06-23 09:15:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Get rid of the reliance on rref

Browse Source 
It provides information more correctly obtained from
get_connection_status().
This commit is contained in:
Jean-Paul Calderone
2017-07-27 16:31:41 -04:00
parent 1f16a173f0
commit e32f581d07
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/allmydata/test/web/test_web.py
View File

@ -184,7 +184,7 @@ class FakeDisplayableServer(StubServer):
self.last_loss_time = last_loss_time self.last_loss_time = last_loss_time
self.last_rx_time = last_rx_time self.last_rx_time = last_rx_time
self.last_connect_time = last_connect_time self.last_connect_time = last_connect_time
self.rref = None
def on_status_changed(self, cb): # TODO: try to remove me def on_status_changed(self, cb): # TODO: try to remove me
cb(self) cb(self)
def is_connected(self): # TODO: remove me def is_connected(self): # TODO: remove me
@ -756,14 +756,14 @@ class Web(WebMixin, WebErrorMixin, testutil.StallMixin, testutil.ReallyEqualMixi
{u"nodeid": u'other_nodeid', {u"nodeid": u'other_nodeid',
u'available_space': 123456, u'available_space': 123456,
u'connection_status': u'summary', u'connection_status': u'summary',
u'last_received_data': None, u'last_received_data': 30,
u'nickname': u'other_nickname \u263b', u'nickname': u'other_nickname \u263b',
u'version': u'1.0', u'version': u'1.0',
}, },
{u"nodeid": u'disconnected_nodeid', {u"nodeid": u'disconnected_nodeid',
u'available_space': 123456, u'available_space': 123456,
u'connection_status': u'summary', u'connection_status': u'summary',
u'last_received_data': None, u'last_received_data': 35,
u'nickname': u'disconnected_nickname \u263b', u'nickname': u'disconnected_nickname \u263b',
u'version': u'1.0', u'version': u'1.0',
}, },

9
src/allmydata/web/root.py
View File

@ -221,22 +221,19 @@ class Root(MultiFormatPage):
def _describe_server(self, server): def _describe_server(self, server):
status = server.get_connection_status()
description = { description = {
u"nodeid": server.get_serverid(), u"nodeid": server.get_serverid(),
u"connection_status": server.get_connection_status().summary, u"connection_status": status.summary,
u"available_space": server.get_available_space(), u"available_space": server.get_available_space(),
u"nickname": server.get_nickname(), u"nickname": server.get_nickname(),
u"version": None, u"version": None,
u"last_received_data": None, u"last_received_data": status.last_received_time,
} }
version = server.get_version() version = server.get_version()
if version is not None: if version is not None:
description[u"version"] = version["application-version"] description[u"version"] = version["application-version"]
rref = server.rref
if rref is not None:
description[u"last_received_data"] = rref.getDataLastReceivedAt()
return description return description