summary refs log tree commit diff
path: root/synapse/app
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-11-20 17:10:37 +0000
committerMark Haines <mark.haines@matrix.org>2014-11-20 17:10:37 +0000
commitdfdda2c8718b11bff9eb69d382eff72c9f8a3d79 (patch)
tree23b5cb61864bcffc5a0fd371758bf97febcd0367 /synapse/app
parentAdd a few missing yields, Move deferred lists inside PreserveLoggingContext b... (diff)
downloadsynapse-dfdda2c8718b11bff9eb69d382eff72c9f8a3d79.tar.xz
Use module loggers rather than the root logger. Exceptions caused by bad clients shouldn't cause ERROR level logging. Fix sql logging to use 'repr' rather than 'str'
Diffstat (limited to 'synapse/app')
-rwxr-xr-xsynapse/app/homeserver.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index 85284a4919..fddb24b520 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -116,7 +116,7 @@ class SynapseHomeServer(HomeServer):
         # extra resources to existing nodes. See self._resource_id for the key.
         resource_mappings = {}
         for (full_path, resource) in desired_tree:
-            logging.info("Attaching %s to path %s", resource, full_path)
+            logger.info("Attaching %s to path %s", resource, full_path)
             last_resource = self.root_resource
             for path_seg in full_path.split('/')[1:-1]:
                 if not path_seg in last_resource.listNames():
@@ -221,12 +221,12 @@ def setup():
 
     db_name = hs.get_db_name()
 
-    logging.info("Preparing database: %s...", db_name)
+    logger.info("Preparing database: %s...", db_name)
 
     with sqlite3.connect(db_name) as db_conn:
         prepare_database(db_conn)
 
-    logging.info("Database prepared in %s.", db_name)
+    logger.info("Database prepared in %s.", db_name)
 
     hs.get_db_pool()