open.source/magic-wormhole
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

u"" cleanup on transit_server.py

Browse Source
This commit is contained in:
laharah 2016-06-04 13:08:38 -07:00
parent 64f7348d05
commit 2c38795476
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/wormhole/server/transit_server.py
View File

@ -115,14 +115,14 @@ class TransitConnection(protocol.Protocol):
finished = time.time() finished = time.time()
if not self._had_buddy: # 1 if not self._had_buddy: # 1
total_time = finished - self._started total_time = finished - self._started
self.factory.recordUsage(self._started, u"lonely", 0, self.factory.recordUsage(self._started, "lonely", 0,
total_time, None) total_time, None)
if self._had_buddy and self._buddy: # 2,4 if self._had_buddy and self._buddy: # 2,4
total_bytes = self._total_sent + self._buddy._total_sent total_bytes = self._total_sent + self._buddy._total_sent
starts = [self._started, self._buddy._started] starts = [self._started, self._buddy._started]
total_time = finished - min(starts) total_time = finished - min(starts)
waiting_time = max(starts) - min(starts) waiting_time = max(starts) - min(starts)
self.factory.recordUsage(self._started, u"happy", total_bytes, self.factory.recordUsage(self._started, "happy", total_bytes,
total_time, waiting_time) total_time, waiting_time)
def disconnect(self): def disconnect(self):
@ -130,7 +130,7 @@ class TransitConnection(protocol.Protocol):
self.factory.transitFailed(self) self.factory.transitFailed(self)
finished = time.time() finished = time.time()
total_time = finished - self._started total_time = finished - self._started
self.factory.recordUsage(self._started, u"errory", 0, self.factory.recordUsage(self._started, "errory", 0,
total_time, None) total_time, None)
class Transit(protocol.ServerFactory, service.MultiService): class Transit(protocol.ServerFactory, service.MultiService):