diff --git a/synapse/config/_base.py b/synapse/config/_base.py
index 8ebd2eba4a..6870af10e8 100644
--- a/synapse/config/_base.py
+++ b/synapse/config/_base.py
@@ -36,7 +36,10 @@ class Config(object):
if file_path is None:
raise ConfigError(
"Missing config for %s."
- " Try running again with --generate-config"
+ " You must specify a path for the config file. You can "
+ "do this with the -c or --config-path option. "
+ "Adding --generate-config along with --server-name "
+ "<server name> will generate a config file at the given path."
% (config_name,)
)
if not os.path.exists(file_path):
diff --git a/synapse/config/logger.py b/synapse/config/logger.py
index 05611d02f7..8566296433 100644
--- a/synapse/config/logger.py
+++ b/synapse/config/logger.py
@@ -14,7 +14,7 @@
# limitations under the License.
from ._base import Config
-
+from synapse.util.logcontext import LoggingContextFilter
from twisted.python.log import PythonLoggingObserver
import logging
import logging.config
@@ -46,7 +46,8 @@ class LoggingConfig(Config):
def setup_logging(self):
log_format = (
- '%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(message)s'
+ "%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s"
+ " - %(message)s"
)
if self.log_config is None:
@@ -54,13 +55,20 @@ class LoggingConfig(Config):
if self.verbosity:
level = logging.DEBUG
- # FIXME: we need a logging.WARN for a -q quiet option
+ # FIXME: we need a logging.WARN for a -q quiet option
+ logger = logging.getLogger('')
+ logger.setLevel(level)
+ formatter = logging.Formatter(log_format)
+ if self.log_file:
+ handler = logging.FileHandler(self.log_file)
+ else:
+ handler = logging.StreamHandler()
+ handler.setFormatter(formatter)
+
+ handler.addFilter(LoggingContextFilter(request=""))
- logging.basicConfig(
- level=level,
- filename=self.log_file,
- format=log_format
- )
+ logger.addHandler(handler)
+ logger.info("Test")
else:
logging.config.fileConfig(self.log_config)
diff --git a/synapse/config/server.py b/synapse/config/server.py
index 3afda12d5a..814a4c349b 100644
--- a/synapse/config/server.py
+++ b/synapse/config/server.py
@@ -30,6 +30,7 @@ class ServerConfig(Config):
self.pid_file = self.abspath(args.pid_file)
self.webclient = True
self.manhole = args.manhole
+ self.no_tls = args.no_tls
if not args.content_addr:
host = args.server_name
@@ -67,6 +68,8 @@ class ServerConfig(Config):
server_group.add_argument("--content-addr", default=None,
help="The host and scheme to use for the "
"content repository")
+ server_group.add_argument("--no-tls", action='store_true',
+ help="Don't bind to the https port.")
def read_signing_key(self, signing_key_path):
signing_keys = self.read_file(signing_key_path, "signing_key")
|
