diff options
| author | Erik Johnston <erikj@jki.re> | 2017-04-07 09:39:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 09:39:52 +0100 |
| commit | 98ce212093bbe87c8cd2b5c92ee1587aba5cc1fa (patch) | |
| tree | a6d9b00000e962c0a7e87bfe3d4a498f3f825641 /synapse/app/synchrotron.py | |
| parent | Use iteritems (diff) | |
| parent | Document types of the replication streams (diff) | |
| download | synapse-98ce212093bbe87c8cd2b5c92ee1587aba5cc1fa.tar.xz | |
Merge pull request #2103 from matrix-org/erikj/no-double-encode
Don't double encode replication data
Diffstat (limited to 'synapse/app/synchrotron.py')
| -rw-r--r-- | synapse/app/synchrotron.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/synapse/app/synchrotron.py b/synapse/app/synchrotron.py index 67d9210f2a..d39e3161fe 100644 --- a/synapse/app/synchrotron.py +++ b/synapse/app/synchrotron.py @@ -62,7 +62,6 @@ import sys import logging import contextlib import gc -import ujson as json logger = logging.getLogger("synapse.app.synchrotron") @@ -254,9 +253,8 @@ class SynchrotronTyping(object): self._latest_room_serial = token for row in rows: - typing = json.loads(row.user_ids) self._room_serials[row.room_id] = token - self._room_typing[row.room_id] = typing + self._room_typing[row.room_id] = row.user_ids class SynchrotronApplicationService(object): |