diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2020-03-10 18:42:15 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-10 18:42:15 +0000 |
| commit | 6640460d054e8f4444046a34bdf638921b31c01e (patch) | |
| tree | 065818deeadd4d46e0f14ba1023fd68b5aaf7dba /synapse/storage/database.py | |
| parent | Merge pull request #7055 from matrix-org/babolivier/get_time_of_last_push_act... (diff) | |
| parent | Rephrase default message (diff) | |
| download | synapse-6640460d054e8f4444046a34bdf638921b31c01e.tar.xz | |
Merge pull request #7058 from matrix-org/babolivier/saml_error_html
SAML2: render a comprehensible error page if something goes wrong
Diffstat (limited to 'synapse/storage/database.py')
| -rw-r--r-- | synapse/storage/database.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/synapse/storage/database.py b/synapse/storage/database.py index 609db40616..e61595336c 100644 --- a/synapse/storage/database.py +++ b/synapse/storage/database.py @@ -29,7 +29,11 @@ from twisted.internet import defer from synapse.api.errors import StoreError from synapse.config.database import DatabaseConnectionConfig -from synapse.logging.context import LoggingContext, make_deferred_yieldable +from synapse.logging.context import ( + LoggingContext, + LoggingContextOrSentinel, + make_deferred_yieldable, +) from synapse.metrics.background_process_metrics import run_as_background_process from synapse.storage.background_updates import BackgroundUpdater from synapse.storage.engines import BaseDatabaseEngine, PostgresEngine, Sqlite3Engine @@ -543,7 +547,9 @@ class Database(object): Returns: Deferred: The result of func """ - parent_context = LoggingContext.current_context() + parent_context = ( + LoggingContext.current_context() + ) # type: Optional[LoggingContextOrSentinel] if parent_context == LoggingContext.sentinel: logger.warning( "Starting db connection from sentinel context: metrics will be lost" |