From 596e13ce74da90b176767c8e719b327e057bcd83 Mon Sep 17 00:00:00 2001
From: Azrenbeth <7782548+Azrenbeth@users.noreply.github.com>
Date: Mon, 27 Sep 2021 16:35:13 +0100
Subject: Better search for state database

---
 synapse/util/state_compressor.py | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'synapse/util')

diff --git a/synapse/util/state_compressor.py b/synapse/util/state_compressor.py
index 672e6f91c9..6ec58dc9c6 100644
--- a/synapse/util/state_compressor.py
+++ b/synapse/util/state_compressor.py
@@ -57,16 +57,14 @@ def setup_state_compressor(hs: "HomeServer"):
         return
 
     # Check that the database being used is postgres
-    if hs.get_datastores().state is not None:
-        for conf in hs.config.database.databases:
-            if conf.name == "state":
-                db_config = conf.config
-                break
-    else:
-        for conf in hs.config.database.databases:
-            if conf.name == "master":
-                db_config = conf.config
-                break
+    db_config = None
+    for conf in hs.config.database.databases:
+        if "state" in conf.databases:
+            db_config = conf.config
+            break
+
+    # One of the databases should have the state tables in
+    assert db_config is not None
 
     if db_config["name"] != "psycopg2":
         return
-- 
cgit 1.5.1