summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-12-06 17:42:14 +0000
committerErik Johnston <erik@matrix.org>2019-12-10 13:21:04 +0000
commit663238aeb4ff1df2e857a12355fdf7cf76dcd6d9 (patch)
treeabce25674a90775f7de326a913872d926e31fe76
parentMerge tag 'v1.7.0rc1' into develop (diff)
downloadsynapse-663238aeb4ff1df2e857a12355fdf7cf76dcd6d9.tar.xz
Phone home stats DB reporting should not assume a single DB.
Diffstat (limited to '')
-rw-r--r--synapse/app/homeserver.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index df65d0a989..032010600a 100644
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -519,8 +519,10 @@ def phone_stats_home(hs, stats, stats_process=_stats_process):
     # Database version
     #
 
-    stats["database_engine"] = hs.database_engine.module.__name__
-    stats["database_server_version"] = hs.database_engine.server_version
+    # This only reports info about the *main* database.
+    stats["database_engine"] = hs.get_datastore().db.engine.module.__name__
+    stats["database_server_version"] = hs.get_datastore().db.engine.server_version
+
     logger.info("Reporting stats to %s: %s" % (hs.config.report_stats_endpoint, stats))
     try:
         yield hs.get_proxied_http_client().put_json(