summary refs log tree commit diff
path: root/synapse/storage/engines/postgres.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-03-24 13:24:42 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-03-24 13:24:42 +0000
commit9b74549f835b3294e35f55fbf4fe6afac459328f (patch)
tree7f960d8c25aece863e7778f73ccabe6e4ff94bb0 /synapse/storage/engines/postgres.py
parentEnsure 'deactivated' parameter is a boolean on user admin API, Fix error hand... (diff)
parentUpdated warning for incorrect database collation/ctype (#6985) (diff)
downloadsynapse-9b74549f835b3294e35f55fbf4fe6afac459328f.tar.xz
Updated warning for incorrect database collation/ctype (#6985)
* commit '7728d87fd':
  Updated warning for incorrect database collation/ctype (#6985)
Diffstat (limited to 'synapse/storage/engines/postgres.py')
-rw-r--r--synapse/storage/engines/postgres.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/synapse/storage/engines/postgres.py b/synapse/storage/engines/postgres.py

index a077345960..53b3f372b0 100644 --- a/synapse/storage/engines/postgres.py +++ b/synapse/storage/engines/postgres.py
@@ -53,7 +53,7 @@ class PostgresEngine(object): if rows and rows[0][0] != "UTF8": raise IncorrectDatabaseSetup( "Database has incorrect encoding: '%s' instead of 'UTF8'\n" - "See docs/postgres.rst for more information." % (rows[0][0],) + "See docs/postgres.md for more information." % (rows[0][0],) ) txn.execute( @@ -62,12 +62,16 @@ class PostgresEngine(object): collation, ctype = txn.fetchone() if collation != "C": logger.warning( - "Database has incorrect collation of %r. Should be 'C'", collation + "Database has incorrect collation of %r. Should be 'C'\n" + "See docs/postgres.md for more information.", + collation, ) if ctype != "C": logger.warning( - "Database has incorrect ctype of %r. Should be 'C'", ctype + "Database has incorrect ctype of %r. Should be 'C'\n" + "See docs/postgres.md for more information.", + ctype, ) def check_new_database(self, txn):