Changeset 1c67b41 in mainline

Timestamp:

2012-08-16T11:20:24Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

eab3d04

Parents:

04da852

Message:

Use log level names when printing instead of numbers

Location:

uspace

Files:

• lib/c/generic/io/log.c (modified) (2 diffs)
• lib/c/include/io/log.h (modified) (1 diff)
• srv/logger/namespace.c (modified) (1 diff)

uspace/lib/c/generic/io/log.c

@@ -46 +46 @@
 static const char *log_prog_name;
 
+static const char *log_level_names[] = {
+        "fatal",
+        "error",
+        "warn",
+        "note",
+        "debug",
+        "debug2"
+};
+
 /** IPC session with the logger service. */
 static async_sess_t *logger_session;
@@ -162 +171 @@
 }
 
+const char *log_level_str(log_level_t level)
+{
+        if (level >= LVL_LIMIT)
+                return "unknown";
+        else
+                return log_level_names[level];
+}
+
 /** Initialize the logging system.
  *

uspace/lib/c/include/io/log.h

@@ -50 +50 @@
 } log_level_t;
 
+extern const char *log_level_str(log_level_t);
+
 extern bool __log_shall_record(log_level_t);
 extern int log_init(const char *, log_level_t);

uspace/srv/logger/namespace.c

@@ -218 +218 @@
 {
         if (level <= namespace_get_actual_log_level(namespace)) {
-                printf("[%s %d]: %s\n", namespace->name, level, message);
-                fprintf(namespace->logfile, "[%d]: %s\n", level, message);
+                const char *level_name = log_level_str(level);
+                printf("[%s %s]: %s\n", namespace->name, level_name, message);
+                fprintf(namespace->logfile, "%s: %s\n", level_name, message);
                 fflush(namespace->logfile);
                 fflush(stdout);