diff options
| author | Erik Johnston <erikj@element.io> | 2024-05-29 12:04:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-29 12:04:13 +0100 |
| commit | 967b6948b0d738bc685d433d44e82631fd2ad232 (patch) | |
| tree | 3c8b8747c2596859593ae9deb7e918f717d590cc /synapse/storage/engines/postgres.py | |
| parent | Ignore attempts to send to-device messages to bad users (#17240) (diff) | |
| download | synapse-967b6948b0d738bc685d433d44e82631fd2ad232.tar.xz | |
Change allow_unsafe_locale to also apply on new databases (#17238)
We relax this as there are use cases where this is safe, though it is still highly recommended that people avoid using it.
Diffstat (limited to '')
| -rw-r--r-- | synapse/storage/engines/postgres.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/synapse/storage/engines/postgres.py b/synapse/storage/engines/postgres.py index b9168ee074..90641d5a18 100644 --- a/synapse/storage/engines/postgres.py +++ b/synapse/storage/engines/postgres.py @@ -142,6 +142,10 @@ class PostgresEngine( apply stricter checks on new databases versus existing database. """ + allow_unsafe_locale = self.config.get("allow_unsafe_locale", False) + if allow_unsafe_locale: + return + collation, ctype = self.get_db_locale(txn) errors = [] @@ -155,7 +159,9 @@ class PostgresEngine( if errors: raise IncorrectDatabaseSetup( "Database is incorrectly configured:\n\n%s\n\n" - "See docs/postgres.md for more information." % ("\n".join(errors)) + "See docs/postgres.md for more information. You can override this check by" + "setting 'allow_unsafe_locale' to true in the database config.", + "\n".join(errors), ) def convert_param_style(self, sql: str) -> str: |