manager: fix GC logic

[elogind.git] / log.c

diff --git a/log.c b/log.c
index a1ca5d02272176c14e190fb9401c8d5c2f99ac5a..d8cc4048c4fec2232d41afce7b2a75b43cb2913c 100644 (file)
--- a/log.c
+++ b/log.c
@@ -43,7 +43,7 @@ static int kmsg_fd = -1;
 void log_close_kmsg(void) {
 
         if (kmsg_fd >= 0) {
-                close_nointr(kmsg_fd);
+                close_nointr_nofail(kmsg_fd);
                 kmsg_fd = -1;
         }
 }
@@ -58,8 +58,10 @@ int log_open_kmsg(void) {
         if (kmsg_fd >= 0)
                 return 0;
 
-        if ((kmsg_fd = open("/dev/kmsg", O_WRONLY|O_NOCTTY|O_CLOEXEC)) < 0)
+        if ((kmsg_fd = open("/dev/kmsg", O_WRONLY|O_NOCTTY|O_CLOEXEC)) < 0) {
+                log_info("Failed to open syslog for logging: %s", strerror(errno));
                 return -errno;
+        }
 
         log_info("Succesfully opened /dev/kmsg for logging.");
 
@@ -69,7 +71,7 @@ int log_open_kmsg(void) {
 void log_close_syslog(void) {
 
         if (syslog_fd >= 0) {
-                close_nointr(syslog_fd);
+                close_nointr_nofail(syslog_fd);
                 syslog_fd = -1;
         }
 }
@@ -109,7 +111,9 @@ int log_open_syslog(void) {
         if (connect(syslog_fd, &sa.sa, sizeof(sa)) < 0) {
                 r = -errno;
                 log_close_syslog();
-                return -errno;
+
+                log_info("Failed to open syslog for logging: %s", strerror(-r));
+                return r;
         }
 
         log_info("Succesfully opened syslog for logging.");
@@ -309,6 +313,14 @@ void log_parse_environment(void) {
                         log_warning("Failed to parse log level %s. Ignoring.", e);
 }
 
+LogTarget log_get_target(void) {
+        return log_target;
+}
+
+int log_get_max_level(void) {
+        return log_max_level;
+}
+
 static const char *const log_target_table[] = {
         [LOG_TARGET_CONSOLE] = "console",
         [LOG_TARGET_SYSLOG] = "syslog",