Allow sharded database in db migrate script

Signed-off-by: Finn Herzfeld <finn@beeper.com>
matrix-org · Jul 29, 2022 · 0874fd4 · 0874fd4
1 parent d548d8f
commit 0874fd4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/changelog.d/13422.bugfix b/changelog.d/13422.bugfix
@@ -0,0 +1 @@
+let update_synapse_database run in configurations with multiple databases. Contributed by @thefinn93 @ Beeper.
diff --git a/synapse/_scripts/update_synapse_database.py b/synapse/_scripts/update_synapse_database.py
@@ -97,8 +97,8 @@ def main() -> None:
     # Load, process and sanity-check the config.
     hs_config = yaml.safe_load(args.database_config)
 
-    if "database" not in hs_config:
-        sys.stderr.write("The configuration file must have a 'database' section.\n")
+    if "database" not in hs_config and "databases" not in hs_config:
+        sys.stderr.write("The configuration file must have a 'database' or 'databases' section.\n")
         sys.exit(4)
 
     config = HomeServerConfig()
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		let update_synapse_database run in configurations with multiple databases. Contributed by @thefinn93 @ Beeper.