summary refs log tree commit diff
path: root/synapse/app
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-12-19 14:53:15 +0000
committerGitHub <noreply@github.com>2019-12-19 14:53:15 +0000
commitbca30cefee3849813565dd71e571172818629d85 (patch)
treed958b04ebf70806c7f57e0a0c49acaf055811b61 /synapse/app
parentFix sdnotify with acme enabled (#6571) (diff)
downloadsynapse-bca30cefee3849813565dd71e571172818629d85.tar.xz
Improve diagnostics on database upgrade failure (#6570)
`Failed to upgrade database` is not helpful, and it's unlikely that UPGRADE.rst
has anything useful.
Diffstat (limited to 'synapse/app')
-rw-r--r--synapse/app/homeserver.py9
1 files changed, 2 insertions, 7 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index b8661457e2..0e9bf7f53a 100644
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -342,13 +342,8 @@ def setup(config_options):
         hs.setup()
     except IncorrectDatabaseSetup as e:
         quit_with_error(str(e))
-    except UpgradeDatabaseException:
-        sys.stderr.write(
-            "\nFailed to upgrade database.\n"
-            "Have you checked for version specific instructions in"
-            " UPGRADES.rst?\n"
-        )
-        sys.exit(1)
+    except UpgradeDatabaseException as e:
+        quit_with_error("Failed to upgrade database: %s" % (e,))
 
     hs.setup_master()