mirror of
https://github.com/element-hq/synapse
synced 2024-09-12 03:35:10 +00:00
Decode buffers in same thread
This commit is contained in:
parent
472be88674
commit
09177f4f2e
1 changed files with 19 additions and 13 deletions
|
@ -44,20 +44,26 @@ class PusherStore(SQLBaseStore):
|
||||||
|
|
||||||
@defer.inlineCallbacks
|
@defer.inlineCallbacks
|
||||||
def get_all_pushers(self):
|
def get_all_pushers(self):
|
||||||
sql = (
|
def get_pushers(txn):
|
||||||
"SELECT * FROM pushers"
|
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.returnValue(rows)
|
||||||
|
|
||||||
@defer.inlineCallbacks
|
@defer.inlineCallbacks
|
||||||
|
|
Loading…
Reference in a new issue