Merge pull request #2103 from matrix-org/erikj/no-double-encode

Don't double encode replication data
This commit is contained in:
Erik Johnston 2017-04-07 09:39:52 +01:00 committed by GitHub
commit 98ce212093
5 changed files with 88 additions and 47 deletions

View file

@ -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):