From 973b1ffa7d879139a9a48f3c81d655ca7b242389 Mon Sep 17 00:00:00 2001 From: Arksine Date: Fri, 31 Jul 2020 05:54:45 -0400 Subject: [PATCH] moonraker: enable debug logging via the command line Signed-off-by: Eric Callahan --- moonraker/app.py | 4 ++-- moonraker/moonraker.py | 7 +++++-- moonraker/utils.py | 2 -- moonraker/websockets.py | 7 +++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/moonraker/app.py b/moonraker/app.py index e482080..da255d2 100644 --- a/moonraker/app.py +++ b/moonraker/app.py @@ -10,7 +10,7 @@ import logging import tornado from inspect import isclass from tornado.routing import Rule, PathMatches, AnyMatches -from utils import DEBUG, ServerError +from utils import ServerError from websockets import WebsocketManager, WebSocket from authorization import AuthorizedRequestHandler, AuthorizedFileHandler from authorization import Authorization @@ -115,7 +115,7 @@ class MoonrakerApp: self.app = tornado.web.Application( app_handlers, - serve_traceback=DEBUG, + serve_traceback=args.debug, websocket_ping_interval=10, websocket_ping_timeout=30, enable_cors=False) diff --git a/moonraker/moonraker.py b/moonraker/moonraker.py index 16784d1..d242d79 100644 --- a/moonraker/moonraker.py +++ b/moonraker/moonraker.py @@ -19,7 +19,7 @@ from tornado.ioloop import IOLoop, PeriodicCallback from tornado.util import TimeoutError from tornado.locks import Event from app import MoonrakerApp -from utils import ServerError, DEBUG, MoonrakerLoggingHandler +from utils import ServerError, MoonrakerLoggingHandler INIT_MS = 1000 @@ -426,6 +426,9 @@ def main(): parser.add_argument( "-k", "--apikey", default="~/.moonraker_api_key", metavar='', help="API Key file location") + parser.add_argument( + "-d", "--debug", action='store_true', + help="Enable Debug Logging") cmd_line_args = parser.parse_args() # Setup Logging @@ -435,7 +438,7 @@ def main(): file_hdlr = MoonrakerLoggingHandler( log_file, when='midnight', backupCount=2) root_logger.addHandler(file_hdlr) - if DEBUG: + if cmd_line_args.debug: root_logger.setLevel(logging.DEBUG) else: root_logger.setLevel(logging.INFO) diff --git a/moonraker/utils.py b/moonraker/utils.py index 4b055b4..85ca7e5 100644 --- a/moonraker/utils.py +++ b/moonraker/utils.py @@ -7,8 +7,6 @@ import logging import os import subprocess -DEBUG = True - class ServerError(Exception): def __init__(self, message, status_code=400): Exception.__init__(self, message) diff --git a/moonraker/websockets.py b/moonraker/websockets.py index 04346dc..cf43fcf 100644 --- a/moonraker/websockets.py +++ b/moonraker/websockets.py @@ -9,7 +9,7 @@ import tornado import json from tornado.ioloop import IOLoop from tornado.websocket import WebSocketHandler, WebSocketClosedError -from utils import ServerError, DEBUG +from utils import ServerError class JsonRPC: def __init__(self): @@ -30,8 +30,7 @@ class JsonRPC: logging.exception(msg) response = self.build_error(-32700, "Parse error") return json.dumps(response) - if DEBUG: - logging.info("Websocket Request::" + data) + logging.debug("Websocket Request::" + data) if isinstance(request, list): response = [] for req in request: @@ -44,7 +43,7 @@ class JsonRPC: response = await self.process_request(request) if response is not None: response = json.dumps(response) - logging.info("Websocket Response::" + response) + logging.debug("Websocket Response::" + response) return response async def process_request(self, request):