From f4c9ebbc345d13c458f63ce2f946339af9eddd26 Mon Sep 17 00:00:00 2001 From: Mark Haines Date: Wed, 29 Apr 2015 11:07:13 +0100 Subject: [PATCH 1/2] Delete ugly commented out log line. --- synapse/config/logger.py | 1 - 1 file changed, 1 deletion(-) diff --git a/synapse/config/logger.py b/synapse/config/logger.py index 1a850f7058..247b324816 100644 --- a/synapse/config/logger.py +++ b/synapse/config/logger.py @@ -78,7 +78,6 @@ class LoggingConfig(Config): handler.addFilter(LoggingContextFilter(request="")) logger.addHandler(handler) - #logger.info("Test") else: with open(self.log_config, 'r') as f: logging.config.dictConfig(yaml.load(f)) From 72443572bf5dd147f50b0168e1078d88476a3e9f Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Wed, 29 Apr 2015 11:50:18 +0100 Subject: [PATCH 2/2] Mention that postgres databases must have the correct charset encoding --- docs/postgres.rst | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/docs/postgres.rst b/docs/postgres.rst index a04ab12b1a..d645e1d697 100644 --- a/docs/postgres.rst +++ b/docs/postgres.rst @@ -1,6 +1,23 @@ Using Postgres -------------- +Set up database +=============== + +The PostgreSQL database used *must* have the correct encoding set, otherwise +would not be able to store UTF8 strings. To create a database with the correct +encoding use, e.g.:: + + CREATE DATABASE synapse + ENCODING 'UTF8' + LC_COLLATE='C' + LC_CTYPE='C' + template=template0 + OWNER synapse_user; + +This would create an appropriate database named ``synapse`` owned by the +``synapse_user`` user (which must already exist). + Set up client =============