From 2f8a1567a8359fecaa53b6f9daee78645c2d133e Mon Sep 17 00:00:00 2001
From: Arksine <arksine.code@gmail.com>
Date: Thu, 31 Dec 2020 20:42:40 -0500
Subject: [PATCH] moonraker:  add --nologfile (-n) option to the command line

This allows moonraker to run without generating a log file.

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
---
 moonraker/app.py       |  3 ++-
 moonraker/moonraker.py |  9 ++++++++-
 moonraker/utils.py     | 18 +++++++++++-------
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/moonraker/app.py b/moonraker/app.py
index be5eb88..6e68444 100644
--- a/moonraker/app.py
+++ b/moonraker/app.py
@@ -131,7 +131,8 @@ class MoonrakerApp:
 
         # Register handlers
         logfile = config['system_args'].get('logfile')
-        self.register_static_file_handler("moonraker.log", logfile)
+        if logfile:
+            self.register_static_file_handler("moonraker.log", logfile)
         self.register_static_file_handler(
             "klippy.log", DEFAULT_KLIPPY_LOG_PATH)
         self.auth.register_handlers(self)
diff --git a/moonraker/moonraker.py b/moonraker/moonraker.py
index 356eef9..244ead6 100755
--- a/moonraker/moonraker.py
+++ b/moonraker/moonraker.py
@@ -551,11 +551,18 @@ def main():
     parser.add_argument(
         "-l", "--logfile", default="/tmp/moonraker.log", metavar='<logfile>',
         help="log file name and location")
+    parser.add_argument(
+        "-n", "--nologfile", action='store_true',
+        help="disable logging to a file")
     system_args = parser.parse_args()
 
     # Setup Logging
     version = utils.get_software_version()
-    log_file = os.path.normpath(os.path.expanduser(system_args.logfile))
+    if system_args.nologfile:
+        log_file = ""
+    else:
+        log_file = os.path.normpath(os.path.expanduser(
+            system_args.logfile))
     system_args.logfile = log_file
     system_args.software_version = version
     ql = utils.setup_logging(log_file, version)
diff --git a/moonraker/utils.py b/moonraker/utils.py
index 55d8b8e..a08a1ef 100644
--- a/moonraker/utils.py
+++ b/moonraker/utils.py
@@ -74,16 +74,20 @@ def setup_logging(log_file, software_version):
     queue_handler = LocalQueueHandler(queue)
     root_logger.addHandler(queue_handler)
     root_logger.setLevel(logging.INFO)
-    file_hdlr = MoonrakerLoggingHandler(
-        software_version, log_file, when='midnight', backupCount=2)
     stdout_hdlr = logging.StreamHandler(sys.stdout)
-    formatter = logging.Formatter(
-        '%(asctime)s [%(filename)s:%(funcName)s()] - %(message)s')
-    file_hdlr.setFormatter(formatter)
     stdout_fmt = logging.Formatter(
         '[%(filename)s:%(funcName)s()] - %(message)s')
     stdout_hdlr.setFormatter(stdout_fmt)
-    listener = logging.handlers.QueueListener(
-        queue, file_hdlr, stdout_hdlr)
+    if log_file:
+        file_hdlr = MoonrakerLoggingHandler(
+            software_version, log_file, when='midnight', backupCount=2)
+        formatter = logging.Formatter(
+            '%(asctime)s [%(filename)s:%(funcName)s()] - %(message)s')
+        file_hdlr.setFormatter(formatter)
+        listener = logging.handlers.QueueListener(
+            queue, file_hdlr, stdout_hdlr)
+    else:
+        listener = logging.handlers.QueueListener(
+            queue, stdout_hdlr)
     listener.start()
     return listener