Merge pull request #116 from cgzones/logging

Logging related changes

Author: ssahani

src/netlog/netlog-manager.c

@@ -219,7 +219,9 @@ static int update_cursor_state(Manager *m) {
         if (r < 0)
                 goto finish;
 
-        fchmod(fileno(f), 0644);
+        r = fchmod(fileno(f), 0644);
+        if (r < 0)
+                log_warning_errno(errno, "Failed to set mode of state %s: %m", m->state_file);
 
         fprintf(f,
                 "# This is private data. Do not parse.\n"
@@ -649,7 +651,8 @@ int manager_new(const char *state_file, const char *cursor, Manager **ret) {
                 },
             };
 
-        (void) socket_address_parse(&m->address, "239.0.0.1:6000");
+        r = socket_address_parse(&m->address, "239.0.0.1:6000");
+        assert(r == 0);
 
         if (!m->state_file)
                 return log_oom();
@@ -665,8 +668,12 @@ int manager_new(const char *state_file, const char *cursor, Manager **ret) {
                 return log_error_errno(r, "Failed to allocate event loop: %m");
 
         assert_se(sigprocmask_many(SIG_BLOCK, NULL, SIGTERM, SIGINT, -1) >= 0);
-        (void) sd_event_add_signal(m->event, NULL, SIGTERM, manager_signal_event_handler, m);
-        (void) sd_event_add_signal(m->event, NULL, SIGINT, manager_signal_event_handler, m);
+        r = sd_event_add_signal(m->event, NULL, SIGTERM, manager_signal_event_handler, m);
+        if (r < 0)
+                log_warning_errno(r, "Failed to add SIGTERM event handler: %m");
+        r = sd_event_add_signal(m->event, NULL, SIGINT, manager_signal_event_handler, m);
+        if (r < 0)
+                log_warning_errno(r, "Failed to add SIGTERM event handler: %m");
 
         sd_event_set_watchdog(m->event, true);
 

src/netlog/systemd-netlogd.c

@@ -48,8 +48,14 @@ static int setup_cursor_state_file(Manager *m, uid_t uid, gid_t gid) {
 
                 /* Try to fix the access mode, so that we can still
                    touch the file after dropping privileges */
-                fchmod(fd, 0644);
-                fchown(fd, uid, gid);
+                r = fchmod(fd, 0644);
+                if (r < 0)
+                        log_warning_errno(r, "Failed to set mode of state file %s: %m",
+                                          m->state_file);
+                r = fchown(fd, uid, gid);
+                if (r < 0)
+                        log_warning_errno(r, "Failed to set ownership of state file %s: %m",
+                                          m->state_file);
         } else
                 /* create stamp file with the compiled-in date */
                 return touch_file(m->state_file, true, USEC_INFINITY, uid, gid, 0644);