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

Stop internal keys from getting into SynapseEvents

Browse source
This commit is contained in:
Erik Johnston 2014-08-21 15:06:00 +01:00
parent 1587ea26fe
commit 063e1b22e6
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -51,6 +51,7 @@ class SynapseEvent(JsonEncodedObject):
"depth", "depth",
"destinations", "destinations",
"origin", "origin",
"outlier",
] ]
required_keys = [ required_keys = [

5
synapse/storage/_base.py
View file

@ -294,6 +294,11 @@ class SQLBaseStore(object):
def _parse_event_from_row(self, row_dict): def _parse_event_from_row(self, row_dict):
d = copy.deepcopy({k: v for k, v in row_dict.items() if v}) d = copy.deepcopy({k: v for k, v in row_dict.items() if v})
d.pop("stream_ordering", None)
d.pop("topological_ordering", None)
d.pop("processed", None)
d.update(json.loads(row_dict["unrecognized_keys"])) d.update(json.loads(row_dict["unrecognized_keys"]))
d["content"] = json.loads(d["content"]) d["content"] = json.loads(d["content"])
del d["unrecognized_keys"] del d["unrecognized_keys"]