From 55c0e2ca95bd1faa0c4ce2654120e75a6063dad8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Tue, 27 Oct 2015 18:13:00 +0100 Subject: [PATCH] Fixed a couple of bugs with daemon and serve commands --- src/octoprint/__init__.py | 1 + src/octoprint/cli/server.py | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/octoprint/__init__.py b/src/octoprint/__init__.py index 8cbf5cd6..74ff84a0 100644 --- a/src/octoprint/__init__.py +++ b/src/octoprint/__init__.py @@ -129,6 +129,7 @@ def init_logging(settings, use_logging_file=True, logging_file=None, default_con config = default_config # configure logging globally + import logging.config logging.config.dictConfig(config) # make sure we log any warnings diff --git a/src/octoprint/cli/server.py b/src/octoprint/cli/server.py index 9be0d924..b697efdd 100644 --- a/src/octoprint/cli/server.py +++ b/src/octoprint/cli/server.py @@ -63,8 +63,6 @@ def serve_command(obj, host, port, logging, allow_root): help="Specify the port on which to bind the server.") @click.option("--logging", type=click.Path(), help="Specify the config file to use for configuring logging.") -@click.option("--debug", "-d", is_flag=True, - help="Enable debug mode") @click.option("--iknowwhatimdoing", "allow_root", is_flag=True, help="Allow OctoPrint to run as user root.") @click.argument("command", type=click.Choice(["start", "stop", "restart"]),