diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-09-27 15:18:21 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-09-27 15:18:21 +0100 |
| commit | f094f715cff95a7cebcbd984dbaccf3f1d81615e (patch) | |
| tree | 0ffd3f4c45b8b50481713e87a226abb7d1cce35e /synapse/app/homeserver.py | |
| parent | Remove redundant, failing, test (diff) | |
| parent | Merge pull request #3794 from matrix-org/erikj/faster_typing (diff) | |
| download | synapse-f094f715cff95a7cebcbd984dbaccf3f1d81615e.tar.xz | |
Merge remote-tracking branch 'origin/develop' into rav/fix_federation_errors
Diffstat (limited to 'synapse/app/homeserver.py')
| -rwxr-xr-x | synapse/app/homeserver.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 8c5d858b0b..a98fdbd210 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -301,7 +301,7 @@ class SynapseHomeServer(HomeServer): try: database_engine.check_database(db_conn.cursor()) except IncorrectDatabaseSetup as e: - quit_with_error(e.message) + quit_with_error(str(e)) # Gauges to expose monthly active user control metrics @@ -328,7 +328,7 @@ def setup(config_options): config_options, ) except ConfigError as e: - sys.stderr.write("\n" + e.message + "\n") + sys.stderr.write("\n" + str(e) + "\n") sys.exit(1) if not config: |