coredump: Support coredump.conf.d directories in the usual search paths

[elogind.git] / src / timesync / timesyncd-manager.c

diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c
index f87722ddcecd11e70e7887046ecd685ae70e217d..3653854a630e15812cf273a56255a3a45f52bd7f 100644 (file)
--- a/src/timesync/timesyncd-manager.c
+++ b/src/timesync/timesyncd-manager.c
@@ -187,10 +187,8 @@ static int manager_send_request(Manager *m) {
 
         if (m->server_socket < 0) {
                 r = manager_listen_setup(m);
-                if (r < 0) {
-                        log_warning_errno(-r, "Failed to setup connection socket: %m");
-                        return r;
-                }
+                if (r < 0)
+                        return log_warning_errno(r, "Failed to setup connection socket: %m");
         }
 
         /*
@@ -213,7 +211,7 @@ static int manager_send_request(Manager *m) {
                 m->pending = true;
                 log_debug("Sent NTP request to %s (%s).", strna(pretty), m->current_server_name->string);
         } else {
-                log_debug("Sending NTP request to %s (%s) failed: %m", strna(pretty), m->current_server_name->string);
+                log_debug_errno(errno, "Sending NTP request to %s (%s) failed: %m", strna(pretty), m->current_server_name->string);
                 return manager_connect(m);
         }
 
@@ -225,10 +223,8 @@ static int manager_send_request(Manager *m) {
                 m->retry_interval = NTP_POLL_INTERVAL_MIN_SEC * USEC_PER_SEC;
 
         r = manager_arm_timer(m, m->retry_interval);
-        if (r < 0) {
-                log_error_errno(-r, "Failed to rearm timer: %m");
-                return r;
-        }
+        if (r < 0)
+                return log_error_errno(r, "Failed to rearm timer: %m");
 
         m->missed_replies++;
         if (m->missed_replies > NTP_MAX_MISSED_REPLIES) {
@@ -238,10 +234,8 @@ static int manager_send_request(Manager *m) {
                                 clock_boottime_or_monotonic(),
                                 now(clock_boottime_or_monotonic()) + TIMEOUT_USEC, 0,
                                 manager_timeout, m);
-                if (r < 0) {
-                        log_error_errno(-r, "Failed to arm timeout timer: %m");
-                        return r;
-                }
+                if (r < 0)
+                        return log_error_errno(r, "Failed to arm timeout timer: %m");
         }
 
         return 0;
@@ -317,21 +311,15 @@ static int manager_clock_watch_setup(Manager *m) {
         safe_close(m->clock_watch_fd);
 
         m->clock_watch_fd = timerfd_create(CLOCK_REALTIME, TFD_NONBLOCK|TFD_CLOEXEC);
-        if (m->clock_watch_fd < 0) {
-                log_error("Failed to create timerfd: %m");
-                return -errno;
-        }
+        if (m->clock_watch_fd < 0)
+                return log_error_errno(errno, "Failed to create timerfd: %m");
 
-        if (timerfd_settime(m->clock_watch_fd, TFD_TIMER_ABSTIME|TFD_TIMER_CANCEL_ON_SET, &its, NULL) < 0) {
-                log_error("Failed to set up timerfd: %m");
-                return -errno;
-        }
+        if (timerfd_settime(m->clock_watch_fd, TFD_TIMER_ABSTIME|TFD_TIMER_CANCEL_ON_SET, &its, NULL) < 0)
+                return log_error_errno(errno, "Failed to set up timerfd: %m");
 
         r = sd_event_add_io(m->event, &m->event_clock_watch, m->clock_watch_fd, EPOLLIN, manager_clock_watch, m);
-        if (r < 0) {
-                log_error_errno(-r, "Failed to create clock watch event source: %m");
-                return r;
-        }
+        if (r < 0)
+                return log_error_errno(r, "Failed to create clock watch event source: %m");
 
         return 0;
 }
@@ -353,7 +341,7 @@ static int manager_adjust_clock(Manager *m, double offset, int leap_sec) {
                 tmx.constant = log2i(m->poll_interval_usec / USEC_PER_SEC) - 4;
                 tmx.maxerror = 0;
                 tmx.esterror = 0;
-                log_debug("  adjust (slew): %+.3f sec\n", offset);
+                log_debug("  adjust (slew): %+.3f sec", offset);
         } else {
                 tmx.modes = ADJ_STATUS | ADJ_NANO | ADJ_SETOFFSET;
 
@@ -368,7 +356,7 @@ static int manager_adjust_clock(Manager *m, double offset, int leap_sec) {
                 }
 
                 m->jumped = true;
-                log_debug("  adjust (jump): %+.3f sec\n", offset);
+                log_debug("  adjust (jump): %+.3f sec", offset);
         }
 
         /*
@@ -690,7 +678,7 @@ static int manager_receive_response(sd_event_source *source, int fd, uint32_t re
                 m->sync = true;
                 r = manager_adjust_clock(m, offset, leap_sec);
                 if (r < 0)
-                        log_error("Failed to call clock_adjtime(): %m");
+                        log_error_errno(errno, "Failed to call clock_adjtime(): %m");
         }
 
         log_info("interval/delta/delay/jitter/drift " USEC_FMT "s/%+.3fs/%.3fs/%.3fs/%+ippm%s",
@@ -698,10 +686,8 @@ static int manager_receive_response(sd_event_source *source, int fd, uint32_t re
                  spike ? " (ignored)" : "");
 
         r = manager_arm_timer(m, m->poll_interval_usec);
-        if (r < 0) {
-                log_error_errno(-r, "Failed to rearm timer: %m");
-                return r;
-        }
+        if (r < 0)
+                return log_error_errno(r, "Failed to rearm timer: %m");
 
         return 0;
 }
@@ -826,10 +812,8 @@ static int manager_resolve_handler(sd_resolve_query *q, int ret, const struct ad
                 }
 
                 r = server_address_new(m->current_server_name, &a, (const union sockaddr_union*) ai->ai_addr, ai->ai_addrlen);
-                if (r < 0) {
-                        log_error_errno(-r, "Failed to add server address: %m");
-                        return r;
-                }
+                if (r < 0)
+                        return log_error_errno(r, "Failed to add server address: %m");
 
                 server_address_pretty(a, &pretty);
                 log_debug("Resolved address %s for %s.", pretty, m->current_server_name->string);
@@ -867,10 +851,8 @@ int manager_connect(Manager *m) {
                 log_debug("Slowing down attempts to contact servers.");
 
                 r = sd_event_add_time(m->event, &m->event_retry, clock_boottime_or_monotonic(), now(clock_boottime_or_monotonic()) + RETRY_USEC, 0, manager_retry_connect, m);
-                if (r < 0) {
-                        log_error_errno(-r, "Failed to create retry timer: %m");
-                        return r;
-                }
+                if (r < 0)
+                        return log_error_errno(r, "Failed to create retry timer: %m");
 
                 return 0;
         }
@@ -923,10 +905,8 @@ int manager_connect(Manager *m) {
                         if (restart && !m->exhausted_servers && m->poll_interval_usec) {
                                 log_debug("Waiting after exhausting servers.");
                                 r = sd_event_add_time(m->event, &m->event_retry, clock_boottime_or_monotonic(), now(clock_boottime_or_monotonic()) + m->poll_interval_usec, 0, manager_retry_connect, m);
-                                if (r < 0) {
-                                        log_error_errno(-r, "Failed to create retry timer: %m");
-                                        return r;
-                                }
+                                if (r < 0)
+                                        return log_error_errno(r, "Failed to create retry timer: %m");
 
                                 m->exhausted_servers = true;
 
@@ -952,10 +932,8 @@ int manager_connect(Manager *m) {
                 log_debug("Resolving %s...", m->current_server_name->string);
 
                 r = sd_resolve_getaddrinfo(m->resolve, &m->resolve_query, m->current_server_name->string, "123", &hints, manager_resolve_handler, m);
-                if (r < 0) {
-                        log_error_errno(-r, "Failed to create resolver: %m");
-                        return r;
-                }
+                if (r < 0)
+                        return log_error_errno(r, "Failed to create resolver: %m");
 
                 return 1;
         }