This repository has been archived by the owner on Dec 13, 2023. It is now read-only.
Fix replication after switch to simplejson #3015
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Turns out that simplejson serialises namedtuple's as dictionaries rather than tuples by default.
richvdh
suggested changes
Mar 19, 2018
synapse/replication/tcp/commands.py
Outdated
| @@ -107,7 +107,7 @@ def to_line(self): | |||
| return " ".join(( | |||
| self.stream_name, | |||
| str(self.token) if self.token is not None else "batch", | |||
| json.dumps(self.row), | |||
| json.dumps(self.row, namedtuple_as_object=False), | |||
There was a problem hiding this comment.
I think if you're going to rely on stuff that's only in simplejson, you ought to import it as simplejson rather than json.
Of course, this blows my "simplejson is the same as json" stuff out of the water...
krombel
added a commit
to krombel/synapse
that referenced
this pull request
Mar 26, 2018
Changes in synapse v0.27.2 (2018-03-26) ======================================= Bug fixes: * Fix bug which broke TCP replication between workers (PR matrix-org#3015)
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Turns out that simplejson serialises namedtuple's as dictionaries rather
than tuples by default.