diff options
| author | Erik Johnston <erik@matrix.org> | 2014-12-03 11:56:49 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-12-03 11:56:49 +0000 |
| commit | 6941a1971548ea8ba37130deeffe2a2e2cd88085 (patch) | |
| tree | 9b6947d42c18e4a7ccb9c4e34525faa8e073cf76 /synapse/config | |
| parent | Begin fleshing out a new Event object (diff) | |
| parent | Fix bug where did not always resolve all the deferreds in _attempt_new_transa... (diff) | |
| download | synapse-6941a1971548ea8ba37130deeffe2a2e2cd88085.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor
Diffstat (limited to 'synapse/config')
| -rw-r--r-- | synapse/config/logger.py | 6 | ||||
| -rw-r--r-- | synapse/config/server.py | 7 |
2 files changed, 11 insertions, 2 deletions
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 |