tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Fix bug where we incorrectly calculated 'age_ts' from 'age' key rather than the reverse. Don't transmit age_ts to clients for now.

Browse source
This commit is contained in:
Erik Johnston 2014-09-15 16:55:39 +01:00
parent 59516a8bb1
commit 40d2f38abe
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
synapse/api/events/__init__.py
View file

@ -25,6 +25,7 @@ def serialize_event(hs, e):
d = e.get_dict() d = e.get_dict()
if "age_ts" in d: if "age_ts" in d:
d["age"] = int(hs.get_clock().time_msec()) - d["age_ts"] d["age"] = int(hs.get_clock().time_msec()) - d["age_ts"]
del d["age_ts"]
return d return d

5
synapse/federation/replication.py
View file

@ -292,8 +292,9 @@ class ReplicationLayer(object):
transaction = Transaction(**transaction_data) transaction = Transaction(**transaction_data)
for p in transaction.pdus: for p in transaction.pdus:
if "age_ts" in p: if "age" in p:
p["age"] = int(self._clock.time_msec()) - int(p["age_ts"]) p["age_ts"] = int(self._clock.time_msec()) - int(p["age"])
del p["age"]
pdu_list = [Pdu(**p) for p in transaction.pdus] pdu_list = [Pdu(**p) for p in transaction.pdus]