diff options
| author | Daniel Wagner-Hall <dawagner@gmail.com> | 2016-03-03 13:56:28 +0000 |
|---|---|---|
| committer | Daniel Wagner-Hall <dawagner@gmail.com> | 2016-03-03 13:56:28 +0000 |
| commit | 95481e7ba70fd5745c409ef285ed6bd0def81426 (patch) | |
| tree | e4d4b3c6215a228055ea3108fa3b0d3b87ecde0d /synapse/storage/engines/postgres.py | |
| parent | jenkins.sh: set -x (diff) | |
| parent | Mark AS users with their AS's ID (diff) | |
| download | synapse-95481e7ba70fd5745c409ef285ed6bd0def81426.tar.xz | |
Merge pull request #571 from matrix-org/daniel/asids
Mark AS users with their AS's ID
Diffstat (limited to 'synapse/storage/engines/postgres.py')
| -rw-r--r-- | synapse/storage/engines/postgres.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/storage/engines/postgres.py b/synapse/storage/engines/postgres.py index 17b7a9c077..a09685b4df 100644 --- a/synapse/storage/engines/postgres.py +++ b/synapse/storage/engines/postgres.py @@ -21,9 +21,10 @@ from ._base import IncorrectDatabaseSetup class PostgresEngine(object): single_threaded = False - def __init__(self, database_module): + def __init__(self, database_module, config): self.module = database_module self.module.extensions.register_type(self.module.extensions.UNICODE) + self.config = config def check_database(self, txn): txn.execute("SHOW SERVER_ENCODING") @@ -44,7 +45,7 @@ class PostgresEngine(object): ) def prepare_database(self, db_conn): - prepare_database(db_conn, self) + prepare_database(db_conn, self, config=self.config) def is_deadlock(self, error): if isinstance(error, self.module.DatabaseError): |