kaslo/synapse
1
0
Fork 0
Code Wiki Activity

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

Browse Source 
* commit '7728d87fd':
  Updated warning for incorrect database collation/ctype (#6985)
This commit is contained in:
Andrew Morgan
2020-03-24 13:24:42 +00:00
parent 4d8fa1d9c2 7728d87fd7
commit 9b74549f83
2 changed files with 8 additions and 3 deletions
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":
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):