diff options
| author | Erik Johnston <erik@matrix.org> | 2019-07-15 14:13:22 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-07-15 14:13:22 +0100 |
| commit | e8c53b07f2fa5cdd671841cb6feed0f6b3f8d073 (patch) | |
| tree | a8105b0f3a9efd467f10500e933125bf203ab42e /synapse/app/appservice.py | |
| parent | Use set_defaults(func=) style (diff) | |
| parent | Return a different error from Invalid Password when a user is deactivated (#5... (diff) | |
| download | synapse-e8c53b07f2fa5cdd671841cb6feed0f6b3f8d073.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_api_cmd
Diffstat (limited to 'synapse/app/appservice.py')
| -rw-r--r-- | synapse/app/appservice.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/app/appservice.py b/synapse/app/appservice.py index 9120bdb143..be44249ed6 100644 --- a/synapse/app/appservice.py +++ b/synapse/app/appservice.py @@ -26,6 +26,7 @@ from synapse.config._base import ConfigError from synapse.config.homeserver import HomeServerConfig from synapse.config.logger import setup_logging from synapse.http.site import SynapseSite +from synapse.logging.context import LoggingContext, run_in_background from synapse.metrics import RegistryProxy from synapse.metrics.resource import METRICS_PREFIX, MetricsResource from synapse.replication.slave.storage.appservice import SlavedApplicationServiceStore @@ -36,7 +37,6 @@ from synapse.replication.tcp.client import ReplicationClientHandler from synapse.server import HomeServer from synapse.storage.engines import create_engine from synapse.util.httpresourcetree import create_resource_tree -from synapse.util.logcontext import LoggingContext, run_in_background from synapse.util.manhole import manhole from synapse.util.versionstring import get_version_string |