add flag for disabling json logging

src/enochecker/checkerservice.py

@@ -28,6 +28,7 @@
 
 def checker_routes(
     checker_cls: Type["BaseChecker"],
+    disable_json_logging: bool,
 ) -> Tuple[
     Callable[[], Response],
     Callable[[], Response],
@@ -73,7 +74,7 @@ def serve_checker() -> Response:
             except jsons.exceptions.UnfulfilledArgumentError as e:
                 return Response(e._msg, status=400)
 
-            checker = checker_cls(task_msg)
+            checker = checker_cls(task_msg, json_logging=(not disable_json_logging))
 
             checker.logger.info(task_msg)
             res = checker.run()
@@ -169,7 +170,9 @@ def get_service_info() -> Response:
     return index, serve_checker, service_info, get_service_info
 
 
-def init_service(checker: Type["BaseChecker"]) -> Flask:
+def init_service(
+    checker: Type["BaseChecker"], disable_json_logging: bool = False
+) -> Flask:
     """
     Initialize a flask app that can be used for WSGI or listen directly.
 
@@ -179,7 +182,9 @@ def init_service(checker: Type["BaseChecker"]) -> Flask:
     :return: a flask app with post and get routes set, ready for checking.
     """
     app = Flask(__name__)
-    index, checker_route, service_info, get_service_info = checker_routes(checker)
+    index, checker_route, service_info, get_service_info = checker_routes(
+        checker, disable_json_logging=disable_json_logging
+    )
 
     app.route("/", methods=["GET"])(index)
     app.route("/", methods=["POST"])(checker_route)

src/enochecker/enochecker.py

@@ -71,6 +71,12 @@ def parse_args(argv: Optional[Sequence[str]] = None) -> argparse.Namespace:
     if argv is None:
         return parse_args(sys.argv[1:])
     parser = argparse.ArgumentParser(description="Your friendly checker script")
+    parser.add_argument(
+        "-j",
+        "--disable-json-logging",
+        action="store_true",
+        help="Disable the JSON (ENOLOGMESSAGE) output",
+    )
 
     subparsers = parser.add_subparsers(
         help="The checker runmode (run/listen)", dest="runmode"
@@ -853,10 +859,15 @@ def run(
     """
     parsed = parse_args(args)
     if parsed.runmode == "listen":
-        checker_cls.service.run(host="::", debug=True, port=parsed.listen_port)
+        flask_app = init_service(
+            checker_cls, disable_json_logging=parsed.disable_json_logging
+        )
+        flask_app.run(host="::", debug=True, port=parsed.listen_port)
         return None
     else:
         task_message = task_message_from_namespace(parsed)
-        result = checker_cls(task_message).run()
+        result = checker_cls(
+            task_message, json_logging=(not parsed.disable_json_logging)
+        ).run()
         print(f"Checker run resulted in Result: {result.result.name}")
         return result