Merge branch 'develop' into erikj/postgres_charset_check

2 files changed, 17 insertions, 1 deletions

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
 =============
 
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))