Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2024-10-01 11:49:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Decode buffers in same thread

Browse Source
This commit is contained in:
Erik Johnston 2015-04-29 18:03:42 +01:00
parent 472be88674
commit 09177f4f2e
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
synapse/storage/pusher.py
View File

@ -44,20 +44,26 @@ class PusherStore(SQLBaseStore):
@defer.inlineCallbacks
def get_all_pushers(self):
sql = (
"SELECT * FROM pushers"
def get_pushers(txn):
txn.execute("SELECT * FROM pushers")
rows = self.cursor_to_dict(txn)
for r in rows:
dataJson = r['data']
r['data'] = None
try:
r['data'] = json.loads(str(dataJson).decode("UTF8"))
except Exception as e:
logger.warn(
"Invalid JSON in data for pusher %d: %s, %s",
r['id'], dataJson, e.message,
)
pass
rows = yield self.runInteraction(
get_pushers,
desc="get_all_pushers",
)
rows = yield self._execute_and_decode("get_all_pushers", sql)
for r in rows:
dataJson = r['data']
r['data'] = None
try:
r['data'] = json.loads(str(dataJson).decode("UTF8"))
except:
logger.warn("Invalid JSON in data for pusher %d: %s", r['id'], dataJson)
pass
defer.returnValue(rows)
@defer.inlineCallbacks