3diy
/
moonraker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

moonraker: enable debug logging via the command line 

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Arksine 2020-07-31 05:54:45 -04:00
parent efb9a9f649
commit 973b1ffa7d
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
moonraker/app.py
View File

@ -10,7 +10,7 @@ import logging
import tornado import tornado
from inspect import isclass from inspect import isclass
from tornado.routing import Rule, PathMatches, AnyMatches from tornado.routing import Rule, PathMatches, AnyMatches
from utils import DEBUG, ServerError from utils import ServerError
from websockets import WebsocketManager, WebSocket from websockets import WebsocketManager, WebSocket
from authorization import AuthorizedRequestHandler, AuthorizedFileHandler from authorization import AuthorizedRequestHandler, AuthorizedFileHandler
from authorization import Authorization from authorization import Authorization
@ -115,7 +115,7 @@ class MoonrakerApp:
self.app = tornado.web.Application( self.app = tornado.web.Application(
app_handlers, app_handlers,
serve_traceback=DEBUG, serve_traceback=args.debug,
websocket_ping_interval=10, websocket_ping_interval=10,
websocket_ping_timeout=30, websocket_ping_timeout=30,
enable_cors=False) enable_cors=False)

7
moonraker/moonraker.py
View File

@ -19,7 +19,7 @@ from tornado.ioloop import IOLoop, PeriodicCallback
from tornado.util import TimeoutError from tornado.util import TimeoutError
from tornado.locks import Event from tornado.locks import Event
from app import MoonrakerApp from app import MoonrakerApp
from utils import ServerError, DEBUG, MoonrakerLoggingHandler from utils import ServerError, MoonrakerLoggingHandler
INIT_MS = 1000 INIT_MS = 1000
@ -426,6 +426,9 @@ def main():
parser.add_argument( parser.add_argument(
"-k", "--apikey", default="~/.moonraker_api_key", "-k", "--apikey", default="~/.moonraker_api_key",
metavar='<apikeyfile>', help="API Key file location") metavar='<apikeyfile>', help="API Key file location")
parser.add_argument(
"-d", "--debug", action='store_true',
help="Enable Debug Logging")
cmd_line_args = parser.parse_args() cmd_line_args = parser.parse_args()
# Setup Logging # Setup Logging
@ -435,7 +438,7 @@ def main():
file_hdlr = MoonrakerLoggingHandler( file_hdlr = MoonrakerLoggingHandler(
log_file, when='midnight', backupCount=2) log_file, when='midnight', backupCount=2)
root_logger.addHandler(file_hdlr) root_logger.addHandler(file_hdlr)
if DEBUG: if cmd_line_args.debug:
root_logger.setLevel(logging.DEBUG) root_logger.setLevel(logging.DEBUG)
else: else:
root_logger.setLevel(logging.INFO) root_logger.setLevel(logging.INFO)

2
moonraker/utils.py
View File

@ -7,8 +7,6 @@ import logging
import os import os
import subprocess import subprocess
DEBUG = True
class ServerError(Exception): class ServerError(Exception):
def __init__(self, message, status_code=400): def __init__(self, message, status_code=400):
Exception.__init__(self, message) Exception.__init__(self, message)

7
moonraker/websockets.py
View File

@ -9,7 +9,7 @@ import tornado
import json import json
from tornado.ioloop import IOLoop from tornado.ioloop import IOLoop
from tornado.websocket import WebSocketHandler, WebSocketClosedError from tornado.websocket import WebSocketHandler, WebSocketClosedError
from utils import ServerError, DEBUG from utils import ServerError
class JsonRPC: class JsonRPC:
def __init__(self): def __init__(self):
@ -30,8 +30,7 @@ class JsonRPC:
logging.exception(msg) logging.exception(msg)
response = self.build_error(-32700, "Parse error") response = self.build_error(-32700, "Parse error")
return json.dumps(response) return json.dumps(response)
if DEBUG: logging.debug("Websocket Request::" + data)
logging.info("Websocket Request::" + data)
if isinstance(request, list): if isinstance(request, list):
response = [] response = []
for req in request: for req in request:
@ -44,7 +43,7 @@ class JsonRPC:
response = await self.process_request(request) response = await self.process_request(request)
if response is not None: if response is not None:
response = json.dumps(response) response = json.dumps(response)
logging.info("Websocket Response::" + response) logging.debug("Websocket Response::" + response)
return response return response
async def process_request(self, request): async def process_request(self, request):