3 files changed, 13 insertions, 4 deletions
diff --git a/synapse/config/_base.py b/synapse/config/_base.py
index 6870af10e8..846570811f 100644
--- a/synapse/config/_base.py
+++ b/synapse/config/_base.py
@@ -44,9 +44,9 @@ class Config(object):
)
if not os.path.exists(file_path):
raise ConfigError(
- "File % config for %s doesn't exist."
+ "File %s config for %s doesn't exist."
" Try running again with --generate-config"
- % (config_name,)
+ % (file_path, config_name,)
)
return cls.abspath(file_path)
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)
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
|
