From afbb5e789a3a25ee875333785149559af5e89970 Mon Sep 17 00:00:00 2001
From: Daniel Friesel <daniel.friesel@uos.de>
Date: Fri, 18 Feb 2022 15:47:08 +0100
Subject: move --log-level and --info to cli.py

---
 bin/analyze-archive.py | 12 ------------
 bin/analyze-kconfig.py | 19 ++++++-------------
 lib/cli.py             | 12 ++++++++++++
 3 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/bin/analyze-archive.py b/bin/analyze-archive.py
index 88b6802..fef8005 100755
--- a/bin/analyze-archive.py
+++ b/bin/analyze-archive.py
@@ -364,11 +364,6 @@ if __name__ == "__main__":
         formatter_class=argparse.RawDescriptionHelpFormatter, description=__doc__
     )
     dfatool.cli.add_standard_arguments(parser)
-    parser.add_argument(
-        "--info",
-        action="store_true",
-        help="Show state duration and (for each state and transition) number of measurements and parameter values)",
-    )
     parser.add_argument(
         "--no-cache", action="store_true", help="Do not load cached measurement results"
     )
@@ -458,13 +453,6 @@ if __name__ == "__main__":
         "All other measurements (including those where it is None, that is, has not been set yet) are discarded. "
         "Note that this may remove entire function calls from the model.",
     )
-    parser.add_argument(
-        "--log-level",
-        metavar="LEVEL",
-        choices=["debug", "info", "warning", "error"],
-        default="warning",
-        help="Set log level",
-    )
     parser.add_argument(
         "--with-safe-functions",
         action="store_true",
diff --git a/bin/analyze-kconfig.py b/bin/analyze-kconfig.py
index b9f071f..a2deaf7 100755
--- a/bin/analyze-kconfig.py
+++ b/bin/analyze-kconfig.py
@@ -72,15 +72,6 @@ def main():
         help="Show model results for symbols in .config file",
         metavar="FILE",
     )
-    parser.add_argument(
-        "--log-level",
-        default=logging.INFO,
-        type=lambda level: getattr(logging, level.upper()),
-        help="Set log level",
-    )
-    parser.add_argument(
-        "--info", action="store_true", help="Show Kconfig and benchmark information"
-    )
     parser.add_argument(
         "--sample-size",
         type=int,
@@ -118,10 +109,12 @@ def main():
 
     args = parser.parse_args()
 
-    if isinstance(args.log_level, int):
-        logging.basicConfig(level=args.log_level)
-    else:
-        print(f"Invalid log level. Setting log level to INFO.", file=sys.stderr)
+    if args.log_level:
+        numeric_level = getattr(logging, args.log_level.upper(), None)
+        if not isinstance(numeric_level, int):
+            print(f"Invalid log level: {args.log_level}", file=sys.stderr)
+            sys.exit(1)
+        logging.basicConfig(level=numeric_level)
 
     if args.export_dref:
         dref = dict()
diff --git a/lib/cli.py b/lib/cli.py
index 91f2add..7995fc7 100644
--- a/lib/cli.py
+++ b/lib/cli.py
@@ -122,6 +122,18 @@ def add_standard_arguments(parser):
         type=str,
         help="Export model and model quality to LaTeX dataref file",
     )
+    parser.add_argument(
+        "--info",
+        action="store_true",
+        help="Show benchmark information (number of measurements, parameter values, ...)",
+    )
+    parser.add_argument(
+        "--log-level",
+        metavar="LEVEL",
+        choices=["debug", "info", "warning", "error"],
+        default="warning",
+        help="Set log level",
+    )
     parser.add_argument(
         "--show-model-size",
         action="store_true",
-- 
cgit v1.2.3