diff options
| author | Travis Ralston <travpc@gmail.com> | 2018-10-12 14:49:58 -0600 |
|---|---|---|
| committer | Travis Ralston <travpc@gmail.com> | 2018-10-12 14:49:58 -0600 |
| commit | e3586f7c06f3c779e87f9ea3bf4e4ac549a451c9 (patch) | |
| tree | 2ef1ecdb2f2c6641a81a47adf51fda62343be7e3 /synapse/app/homeserver.py | |
| parent | Remove debugging statement (diff) | |
| parent | Make workers work on Py3 (#4027) (diff) | |
| download | synapse-e3586f7c06f3c779e87f9ea3bf4e4ac549a451c9.tar.xz | |
Merge branch 'develop' into travis/fix-federated-group-requests
Diffstat (limited to 'synapse/app/homeserver.py')
| -rwxr-xr-x | synapse/app/homeserver.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 8c5d858b0b..e3f0d99a3f 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: @@ -386,7 +386,6 @@ def setup(config_options): hs.get_pusherpool().start() hs.get_datastore().start_profiling() hs.get_datastore().start_doing_background_updates() - hs.get_federation_client().start_get_pdu_cache() reactor.callWhenRunning(start) |