enum cleanup

Author: murrant

LibreNMS/__init__.py

@@ -220,7 +220,7 @@ def call_script(script, args=(), log_dest=None):
             kwargs["stdout"] = subprocess.DEVNULL
             kwargs["stderr"] = subprocess.DEVNULL
 
-        elif log_dest in (LogOutput.STDOUT, LogOutput.STDERR):
+        elif log_dest is LogOutput.PASSTHROUGH:
             kwargs["stdout"] = sys.stdout
             kwargs["stderr"] = sys.stderr
 

LibreNMS/service.py

@@ -42,8 +42,7 @@ class RedisConnectionError(Exception):
 
 class LogOutput(Enum):
     NONE = "none"
-    STDOUT = "stdout"
-    STDERR = "stderr"
+    PASSTHROUGH = "passthrough"
     LOGGER = "logger"
     FILE = "file"
 

librenms-service.py

@@ -34,7 +34,7 @@
         help=(
             "Where to direct poller log messages.\n"
             "  --log-output         = log to file (same as --log-output file)\n"
-            "  --log-output DEST    = log to stdout, stderr, logger, file\n"
+            "  --log-output DEST    = log to none, passthrough, logger, file\n"
             "  (not specified)      = no dedicated poller output logging (=none)"
         ),
     )