Improve logging

src/omniperf_profile/profiler_base.py

@@ -172,12 +172,10 @@ def join_prof(self, out=None):
                 msg = "Detected differing {} values while joining pmc_perf.csv".format(
                     key
                 )
-                console_warning(msg + "\n")
+                console_warning(msg)
             else:
                 msg = "Successfully joined {} in pmc_perf.csv".format(key)
-                console_debug(msg + "\n")
-            if test_df_column_equality(_df) and self.__args.verbose:
-                console_log("profiling", msg)
+                console_debug(msg)
 
         # now, we can:
         #   A) throw away any of the "boring" duplicates

src/utils/logger.py

@@ -30,13 +30,13 @@
 # Define the colors
 BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE = range(8)
 RESET_SEQ = "\033[0m"
-COLOR_SEQ = "\033[1;%dm"
+COLOR_SEQ = "\033[%dm"
 
 COLORS = {
     "WARNING": YELLOW,
-    "INFO": GREEN,
+    "INFO": WHITE,
     "DEBUG": BLUE,
-    "CRITICAL": YELLOW,
+    "CRITICAL": RED,
     "ERROR": RED,
     "TRACE": MAGENTA,
 }
@@ -47,9 +47,12 @@ class ColoredFormatter(logging.Formatter):
     def format(self, record):
         levelname = record.levelname
         if levelname in COLORS:
-            levelname_color = COLOR_SEQ % (30 + COLORS[levelname]) + levelname + RESET_SEQ
-            record.levelname = levelname_color
-        return logging.Formatter.format(self, record)
+            if levelname == "WARNING" or levelname == "ERROR" or levelname == "DEBUG":
+                log_fmt = f"{COLOR_SEQ % (30 + COLORS[levelname])}%(levelname)s: %(message)s{RESET_SEQ}"
+            else:
+                log_fmt = f"{COLOR_SEQ % (30 + COLORS[levelname])}%(message)s{RESET_SEQ}"
+            formatter = logging.Formatter(log_fmt)
+        return formatter.format(record)
 
 
 class PlainFormatter(logging.Formatter):
@@ -70,17 +73,19 @@ def setup_console_handler():
     setattr(logging, "TRACE", logging.TRACE)
     setattr(logging, "trace", trace_logger)
 
-    # setup log formatting
-    color_setting = 0
+    color_setting = 1
     if "OMNIPERF_COLOR" in os.environ.keys():
+        if type(os.environ["OMNIPERF_COLOR"]) != int:
+            raise TypeError(
+                "OMNIPERF_COLOR must be of type int. Detected: {}".format(
+                    type(os.environ["OMNIPERF_COLOR"])
+                )
+            )
         color_setting = int(os.environ["OMNIPERF_COLOR"])
 
     if color_setting == 1:
-        # colored levelname
-        formatter = ColoredFormatter("%(levelname)16s %(message)s")
-    elif color_setting == 2:
-        # non-colored levelname
-        formatter = logging.Formatter("%(levelname)5s %(message)s")
+        # colored loglevel and message
+        formatter = ColoredFormatter()
     else:
         # non-colored
         formatter = PlainFormatter()

src/utils/parser.py

@@ -928,7 +928,9 @@ def load_kernel_top(workload, dir):
             if file.exists():
                 tmp[id] = pd.read_csv(file)
             else:
-                console_warning("Issue loading top kernels. Check pmc_kernel_top.csv")
+                console_warning(
+                    f"Couldn't load {file.name}. This may result in missing analysis data."
+                )
         # NB: Special case for sysinfo. Probably room for improvement in this whole function design
         elif "from_csv_columnwise" in df.columns and id == 101:
             tmp[id] = workload.sys_info.transpose()
@@ -946,7 +948,9 @@ def load_kernel_top(workload, dir):
                 #   so tty could detect them and show them correctly in comparison.
                 tmp[id].columns = ["Info"]
             else:
-                console_warning("Issue loading top kernels. Check pmc_kernel_top.csv")
+                console_warning(
+                    f"Couldn't load {file.name}. This may result in missing analysis data."
+                )
     workload.dfs.update(tmp)