Changeset b52dd1de in mainline

Timestamp:

2012-08-16T09:39:07Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

5882487

Parents:

0a6a996

Message:

Initial logging level can be set through sysinfo

Location:

uspace

Files:

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

uspace/lib/c/generic/io/logctl.c

@@ -36 +36 @@
 #include <io/logctl.h>
 #include <ipc/logger.h>
+#include <sysinfo.h>
 #include <ns.h>
+
+#define SYSINFO_DEFAULT_LOG_LEVEL "logger.level"
 
 /** IPC session with the logger service. */
@@ -73 +76 @@
 }
 
+int logctl_get_boot_level(log_level_t *level)
+{
+        sysarg_t boot_level_arg;
+        int rc = sysinfo_get_value(SYSINFO_DEFAULT_LOG_LEVEL, &boot_level_arg);
+        if (rc != EOK)
+                return rc;
+
+        log_level_t boot_level = (log_level_t) boot_level_arg;
+        if (boot_level >= LVL_LIMIT)
+                return EINVAL;
+
+        if (level != NULL)
+                *level = (log_level_t) boot_level;
+
+        return EOK;
+}
+
 /** @}
  */

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

@@ -37 +37 @@
 
 extern int logctl_set_default_level(log_level_t);
+extern int logctl_get_boot_level(log_level_t *);
 
 #endif

uspace/srv/logger/main.c

@@ -39 +39 @@
 #include <ipc/logger.h>
 #include <io/log.h>
+#include <io/logctl.h>
 #include <ns.h>
 #include <async.h>
@@ -189 +190 @@
         printf(NAME ": HelenOS Logging Service\n");
         
+        /* Get default logging level from sysinfo (if available). */
+        log_level_t boot_logging_level = LVL_NOTE;
+        int rc = logctl_get_boot_level(&boot_logging_level);
+        if (rc == EOK)
+                set_default_logging_level(boot_logging_level);
+        else
+                printf(NAME ": Warn: failed to get logging level from sysinfo: %s.\n",
+                    str_error(rc));
+
         async_set_client_connection(connection_handler);
         
-        int rc = service_register(SERVICE_LOGGER);
+        rc = service_register(SERVICE_LOGGER);
         if (rc != EOK) {
                 printf(NAME ": failed to register: %s.\n", str_error(rc));