diff options
| author | Erik Johnston <erik@matrix.org> | 2017-04-05 11:34:20 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-04-05 11:34:20 +0100 |
| commit | 96b9b6c1275087acf57faf1306bcc392dbd9f842 (patch) | |
| tree | d6e6f13500d57ae2866ab76a2f616a8e89d79ac2 /synapse/app | |
| parent | Don't double json encode federation replication data (diff) | |
| download | synapse-96b9b6c1275087acf57faf1306bcc392dbd9f842.tar.xz | |
Don't double json encode typing replication data
Diffstat (limited to 'synapse/app')
| -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 a1ef5dfa77..1fac021ea9 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") @@ -215,9 +214,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): |