ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-02-22 02:16:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

control.py: remove all uses of s.get_serverid()

Browse Source
This commit is contained in:
Brian Warner 2011-02-26 19:12:03 -07:00
parent 73a54f83d1
commit 70f9f89c66
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/allmydata/control.py
View File

@ -100,23 +100,23 @@ class ControlServer(Referenceable, service.Service):
if not everyone_left:
return results
server = everyone_left.pop(0)
peerid = server.get_serverid()
server_name = server.longname()
connection = server.get_rref()
start = time.time()
d = connection.callRemote("get_buckets", "\x00"*16)
def _done(ignored):
stop = time.time()
elapsed = stop - start
if peerid in results:
results[peerid].append(elapsed)
if server_name in results:
results[server_name].append(elapsed)
else:
results[peerid] = [elapsed]
results[server_name] = [elapsed]
d.addCallback(_done)
d.addCallback(self._do_one_ping, everyone_left, results)
def _average(res):
averaged = {}
for peerid,times in results.iteritems():
averaged[peerid] = sum(times) / len(times)
for server_name,times in results.iteritems():
averaged[server_name] = sum(times) / len(times)
return averaged
d.addCallback(_average)
return d

2
src/allmydata/interfaces.py
View File

@ -2321,7 +2321,7 @@ class RIControlClient(RemoteInterface):
@return: a dictionary mapping peerid to a float (RTT time in seconds)
"""
return DictOf(Nodeid, float)
return DictOf(str, float)
UploadResults = Any() #DictOf(str, str)