summary refs log tree commit diff
path: root/synapse/app/_base.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2020-05-14 10:08:45 +0100
committerRichard van der Hoff <richard@matrix.org>2020-05-14 10:08:45 +0100
commit6bd2a39a7d3dd4d6c6d89828139b905a0eaa051c (patch)
tree8f576436f72b892af6408f3d887c1f8ce9f55046 /synapse/app/_base.py
parentMerge remote-tracking branch 'origin/release-v1.13.0' into matrix-org-hotfixes (diff)
parentStop `get_joined_users` corruption from custom statuses (#7376) (diff)
downloadsynapse-6bd2a39a7d3dd4d6c6d89828139b905a0eaa051c.tar.xz
Merge branch 'release-v1.13.0' into matrix-org-hotfixes
Diffstat (limited to 'synapse/app/_base.py')
-rw-r--r--synapse/app/_base.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/app/_base.py b/synapse/app/_base.py

index 628292b890..dedff81af3 100644 --- a/synapse/app/_base.py +++ b/synapse/app/_base.py
@@ -22,6 +22,7 @@ import sys import traceback from daemonize import Daemonize +from typing_extensions import NoReturn from twisted.internet import defer, error, reactor from twisted.protocols.tls import TLSMemoryBIOFactory @@ -139,9 +140,9 @@ def start_reactor( run() -def quit_with_error(error_string): +def quit_with_error(error_string: str) -> NoReturn: message_lines = error_string.split("\n") - line_length = max(len(l) for l in message_lines if len(l) < 80) + 2 + line_length = max(len(line) for line in message_lines if len(line) < 80) + 2 sys.stderr.write("*" * line_length + "\n") for line in message_lines: sys.stderr.write(" %s\n" % (line.rstrip(),))