diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-03-28 18:32:13 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-28 18:32:13 +0000 |
| commit | 902cdc63b6668bebbf66dc084de057386da59bd8 (patch) | |
| tree | 408a8187c455a4cfc47e8b4fbf6e11aaf0c3c893 /synapse/replication/tcp/protocol.py | |
| parent | Merge pull request #4954 from matrix-org/rav/refactor_parse_row (diff) | |
| parent | changelog (diff) | |
| download | synapse-902cdc63b6668bebbf66dc084de057386da59bd8.tar.xz | |
Merge pull request #4955 from matrix-org/rav/merge_state_into_events
Combine the CurrentStateDeltaStream into the EventStream
Diffstat (limited to 'synapse/replication/tcp/protocol.py')
| -rw-r--r-- | synapse/replication/tcp/protocol.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/replication/tcp/protocol.py b/synapse/replication/tcp/protocol.py index 9daec2c995..b51590cf8f 100644 --- a/synapse/replication/tcp/protocol.py +++ b/synapse/replication/tcp/protocol.py @@ -42,8 +42,8 @@ indicate which side is sending, these are *not* included on the wire:: > POSITION backfill 1 > POSITION caches 1 > RDATA caches 2 ["get_user_by_id",["@01register-user:localhost:8823"],1490197670513] - > RDATA events 14 ["$149019767112vOHxz:localhost:8823", - "!AFDCvgApUmpdfVjIXm:localhost:8823","m.room.guest_access","",null] + > RDATA events 14 ["ev", ["$149019767112vOHxz:localhost:8823", + "!AFDCvgApUmpdfVjIXm:localhost:8823","m.room.guest_access","",null]] < PING 1490197675618 > ERROR server stopping * connection closed by server * |