diff options
| author | Erik Johnston <erik@matrix.org> | 2018-08-22 17:06:10 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-08-22 17:06:10 +0100 |
| commit | fd2dbf183676804cb6925972e67969c51c1a4074 (patch) | |
| tree | 9a9344671dc650b85a5bd42b0fb9d6649ae0834f /synapse/app/appservice.py | |
| parent | Update notice format (diff) | |
| parent | Merge branch 'master' into develop (diff) | |
| download | synapse-fd2dbf183676804cb6925972e67969c51c1a4074.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_notices_on_blocking
Diffstat (limited to 'synapse/app/appservice.py')
| -rw-r--r-- | synapse/app/appservice.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/app/appservice.py b/synapse/app/appservice.py index 9a37384fb7..3348a8ec6d 100644 --- a/synapse/app/appservice.py +++ b/synapse/app/appservice.py @@ -117,8 +117,9 @@ class ASReplicationHandler(ReplicationClientHandler): super(ASReplicationHandler, self).__init__(hs.get_datastore()) self.appservice_handler = hs.get_application_service_handler() + @defer.inlineCallbacks def on_rdata(self, stream_name, token, rows): - super(ASReplicationHandler, self).on_rdata(stream_name, token, rows) + yield super(ASReplicationHandler, self).on_rdata(stream_name, token, rows) if stream_name == "events": max_stream_id = self.store.get_room_max_stream_ordering() |