mirror of
https://github.com/element-hq/synapse
synced 2024-09-04 16:00:07 +00:00
Don't double json encode federation replication data
This commit is contained in:
parent
a5c401bd12
commit
f10ce8944b
2 changed files with 10 additions and 13 deletions
|
@ -51,7 +51,6 @@ from daemonize import Daemonize
|
||||||
import sys
|
import sys
|
||||||
import logging
|
import logging
|
||||||
import gc
|
import gc
|
||||||
import ujson as json
|
|
||||||
|
|
||||||
logger = logging.getLogger("synapse.app.appservice")
|
logger = logging.getLogger("synapse.app.appservice")
|
||||||
|
|
||||||
|
@ -290,8 +289,7 @@ class FederationSenderHandler(object):
|
||||||
# Parse the rows in the stream
|
# Parse the rows in the stream
|
||||||
for row in rows:
|
for row in rows:
|
||||||
typ = row.type
|
typ = row.type
|
||||||
content_js = row.data
|
content = row.data
|
||||||
content = json.loads(content_js)
|
|
||||||
|
|
||||||
if typ == send_queue.PRESENCE_TYPE:
|
if typ == send_queue.PRESENCE_TYPE:
|
||||||
destination = content["destination"]
|
destination = content["destination"]
|
||||||
|
|
|
@ -35,7 +35,6 @@ from synapse.util.metrics import Measure
|
||||||
import synapse.metrics
|
import synapse.metrics
|
||||||
|
|
||||||
from blist import sorteddict
|
from blist import sorteddict
|
||||||
import ujson
|
|
||||||
|
|
||||||
|
|
||||||
metrics = synapse.metrics.get_metrics_for(__name__)
|
metrics = synapse.metrics.get_metrics_for(__name__)
|
||||||
|
@ -258,10 +257,10 @@ class FederationRemoteSendQueue(object):
|
||||||
)
|
)
|
||||||
|
|
||||||
for (key, (dest, user_id)) in dest_user_ids:
|
for (key, (dest, user_id)) in dest_user_ids:
|
||||||
rows.append((key, PRESENCE_TYPE, ujson.dumps({
|
rows.append((key, PRESENCE_TYPE, {
|
||||||
"destination": dest,
|
"destination": dest,
|
||||||
"state": self.presence_map[user_id].as_dict(),
|
"state": self.presence_map[user_id].as_dict(),
|
||||||
})))
|
}))
|
||||||
|
|
||||||
# Fetch changes keyed edus
|
# Fetch changes keyed edus
|
||||||
keys = self.keyed_edu_changed.keys()
|
keys = self.keyed_edu_changed.keys()
|
||||||
|
@ -271,10 +270,10 @@ class FederationRemoteSendQueue(object):
|
||||||
|
|
||||||
for (pos, (destination, edu_key)) in keyed_edus:
|
for (pos, (destination, edu_key)) in keyed_edus:
|
||||||
rows.append(
|
rows.append(
|
||||||
(pos, KEYED_EDU_TYPE, ujson.dumps({
|
(pos, KEYED_EDU_TYPE, {
|
||||||
"key": edu_key,
|
"key": edu_key,
|
||||||
"edu": self.keyed_edu[(destination, edu_key)].get_internal_dict(),
|
"edu": self.keyed_edu[(destination, edu_key)].get_internal_dict(),
|
||||||
}))
|
})
|
||||||
)
|
)
|
||||||
|
|
||||||
# Fetch changed edus
|
# Fetch changed edus
|
||||||
|
@ -284,7 +283,7 @@ class FederationRemoteSendQueue(object):
|
||||||
edus = set((k, self.edus[k]) for k in keys[i:j])
|
edus = set((k, self.edus[k]) for k in keys[i:j])
|
||||||
|
|
||||||
for (pos, edu) in edus:
|
for (pos, edu) in edus:
|
||||||
rows.append((pos, EDU_TYPE, ujson.dumps(edu.get_internal_dict())))
|
rows.append((pos, EDU_TYPE, edu.get_internal_dict()))
|
||||||
|
|
||||||
# Fetch changed failures
|
# Fetch changed failures
|
||||||
keys = self.failures.keys()
|
keys = self.failures.keys()
|
||||||
|
@ -293,10 +292,10 @@ class FederationRemoteSendQueue(object):
|
||||||
failures = set((k, self.failures[k]) for k in keys[i:j])
|
failures = set((k, self.failures[k]) for k in keys[i:j])
|
||||||
|
|
||||||
for (pos, (destination, failure)) in failures:
|
for (pos, (destination, failure)) in failures:
|
||||||
rows.append((pos, FAILURE_TYPE, ujson.dumps({
|
rows.append((pos, FAILURE_TYPE, {
|
||||||
"destination": destination,
|
"destination": destination,
|
||||||
"failure": failure,
|
"failure": failure,
|
||||||
})))
|
}))
|
||||||
|
|
||||||
# Fetch changed device messages
|
# Fetch changed device messages
|
||||||
keys = self.device_messages.keys()
|
keys = self.device_messages.keys()
|
||||||
|
@ -305,9 +304,9 @@ class FederationRemoteSendQueue(object):
|
||||||
device_messages = set((k, self.device_messages[k]) for k in keys[i:j])
|
device_messages = set((k, self.device_messages[k]) for k in keys[i:j])
|
||||||
|
|
||||||
for (pos, destination) in device_messages:
|
for (pos, destination) in device_messages:
|
||||||
rows.append((pos, DEVICE_MESSAGE_TYPE, ujson.dumps({
|
rows.append((pos, DEVICE_MESSAGE_TYPE, {
|
||||||
"destination": destination,
|
"destination": destination,
|
||||||
})))
|
}))
|
||||||
|
|
||||||
# Sort rows based on pos
|
# Sort rows based on pos
|
||||||
rows.sort()
|
rows.sort()
|
||||||
|
|
Loading…
Reference in a new issue