diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-07-27 09:17:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-27 09:17:11 +0100 |
| commit | 7041cd872b8f1105d58f8e8ac79ffd32c76a1994 (patch) | |
| tree | 4736db867cfd029d8e7627edb971eccc926371bc /synapse/handlers/appservice.py | |
| parent | Merge remote-tracking branch 'upstream/develop' into send_sni_for_federation_... (diff) | |
| parent | Merge pull request #3616 from matrix-org/travis/event_id_send_leave (diff) | |
| download | synapse-7041cd872b8f1105d58f8e8ac79ffd32c76a1994.tar.xz | |
Merge branch 'develop' into send_sni_for_federation_requests
Diffstat (limited to 'synapse/handlers/appservice.py')
| -rw-r--r-- | synapse/handlers/appservice.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/handlers/appservice.py b/synapse/handlers/appservice.py index ec9fe01a5a..ee41aed69e 100644 --- a/synapse/handlers/appservice.py +++ b/synapse/handlers/appservice.py @@ -23,6 +23,7 @@ from twisted.internet import defer import synapse from synapse.api.constants import EventTypes +from synapse.metrics.background_process_metrics import run_as_background_process from synapse.util.logcontext import make_deferred_yieldable, run_in_background from synapse.util.metrics import Measure @@ -106,7 +107,9 @@ class ApplicationServicesHandler(object): yield self._check_user_exists(event.state_key) if not self.started_scheduler: - self.scheduler.start().addErrback(log_failure) + def start_scheduler(): + return self.scheduler.start().addErrback(log_failure) + run_as_background_process("as_scheduler", start_scheduler) self.started_scheduler = True # Fork off pushes to these services |