From 7993e3d10dd5b33f6443b974b36b988130f1b156 Mon Sep 17 00:00:00 2001 From: Mark Haines Date: Tue, 2 Dec 2014 17:20:02 +0000 Subject: SYN-187: Set a more sensible default for the content_addr --- synapse/config/server.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'synapse/config') diff --git a/synapse/config/server.py b/synapse/config/server.py index 814a4c349b..f8a0844b8c 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -35,8 +35,11 @@ class ServerConfig(Config): if not args.content_addr: host = args.server_name if ':' not in host: - host = "%s:%d" % (host, args.bind_port) - args.content_addr = "https://%s" % (host,) + host = "%s:%d" % (host, args.unsecure_port) + else: + host = host.split(':')[0] + host = "%s:%d" % (host, args.unsecure_port) + args.content_addr = "http://%s" % (host,) self.content_addr = args.content_addr -- cgit 1.5.1 From 66b0596b7a0995cfc4ca72ba2062014e3f9b8577 Mon Sep 17 00:00:00 2001 From: "Paul \"LeoNerd\" Evans" Date: Tue, 2 Dec 2014 22:28:18 +0000 Subject: Don't log synapse.storage at DEBUG level when under -v; require -v -v for that --- synapse/config/logger.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'synapse/config') diff --git a/synapse/config/logger.py b/synapse/config/logger.py index 8566296433..089d906fa5 100644 --- a/synapse/config/logger.py +++ b/synapse/config/logger.py @@ -52,12 +52,18 @@ class LoggingConfig(Config): if self.log_config is None: level = logging.INFO + level_for_storage = logging.INFO if self.verbosity: level = logging.DEBUG + if self.verbosity > 1: + level_for_storage = logging.DEBUG # FIXME: we need a logging.WARN for a -q quiet option logger = logging.getLogger('') logger.setLevel(level) + + logging.getLogger('synapse.storage').setLevel(level_for_storage) + formatter = logging.Formatter(log_format) if self.log_file: handler = logging.FileHandler(self.log_file) -- cgit 1.5.1