OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Updated warning for incorrect database collation/ctype (#6985) 

Signed-off-by: Uday Bansal <43824981+udaybansal19@users.noreply.github.com>
pull/7003/head
Uday Bansal 2020-02-26 20:47:03 +05:30 committed by GitHub
parent 8c75b621bf
commit 7728d87fd7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/6985.misc Normal file
View File

@ -0,0 +1 @@
Update warning for incorrect database collation/ctype to include link to documentation.

10
synapse/storage/engines/postgres.py
View File

@ -53,7 +53,7 @@ class PostgresEngine(object):
if rows and rows[0][0] != "UTF8": if rows and rows[0][0] != "UTF8":
raise IncorrectDatabaseSetup( raise IncorrectDatabaseSetup(
"Database has incorrect encoding: '%s' instead of 'UTF8'\n" "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( txn.execute(
@ -62,12 +62,16 @@ class PostgresEngine(object):
collation, ctype = txn.fetchone() collation, ctype = txn.fetchone()
if collation != "C": if collation != "C":
logger.warning( 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": if ctype != "C":
logger.warning( 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): def check_new_database(self, txn):