]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
timesyncd: print an INFO log message when we successfully reached a time server
authorLennart Poettering <lennart@poettering.net>
Wed, 8 Apr 2015 18:14:04 +0000 (20:14 +0200)
committerLennart Poettering <lennart@poettering.net>
Wed, 8 Apr 2015 18:14:04 +0000 (20:14 +0200)
src/timesync/timesyncd-manager.c
src/timesync/timesyncd-manager.h

index a9e91c4d60645fa6d1e59fab2b68fb9db15f7b68..88e9cf98ed5be95fe6546cc3d5740c98e3626c7a 100644 (file)
@@ -669,6 +669,16 @@ static int manager_receive_response(sd_event_source *source, int fd, uint32_t re
                   m->poll_interval_usec / USEC_PER_SEC, offset, delay, m->samples_jitter, m->drift_ppm,
                   spike ? " (ignored)" : "");
 
+        if (!m->good) {
+                _cleanup_free_ char *pretty = NULL;
+
+                m->good = true;
+
+                server_address_pretty(m->current_server_address, &pretty);
+                log_info("Synchronized to time server %s (%s).", strna(pretty), m->current_server_name->string);
+                sd_notifyf(false, "STATUS=Synchronized to time server %s (%s).", strna(pretty), m->current_server_name->string);
+        }
+
         r = manager_arm_timer(m, m->poll_interval_usec);
         if (r < 0)
                 return log_error_errno(r, "Failed to rearm timer: %m");
@@ -724,13 +734,14 @@ static int manager_begin(Manager *m) {
         assert_return(m->current_server_name, -EHOSTUNREACH);
         assert_return(m->current_server_address, -EHOSTUNREACH);
 
+        m->good = false;
         m->missed_replies = NTP_MAX_MISSED_REPLIES;
         if (m->poll_interval_usec == 0)
                 m->poll_interval_usec = NTP_POLL_INTERVAL_MIN_SEC * USEC_PER_SEC;
 
         server_address_pretty(m->current_server_address, &pretty);
-        log_debug("Using NTP server %s (%s).", strna(pretty), m->current_server_name->string);
-        sd_notifyf(false, "STATUS=Using Time Server %s (%s).", strna(pretty), m->current_server_name->string);
+        log_debug("Connecting to time server %s (%s).", strna(pretty), m->current_server_name->string);
+        sd_notifyf(false, "STATUS=Connecting to time server %s (%s).", strna(pretty), m->current_server_name->string);
 
         r = manager_clock_watch_setup(m);
         if (r < 0)
index b1a844ba76455ae0b262de21cb510ddb00db4720..090b2fcba88433c71ee46a719878e93110ba82df 100644 (file)
@@ -55,6 +55,7 @@ struct Manager {
         int missed_replies;
         uint64_t packet_count;
         sd_event_source *event_timeout;
+        bool good;
 
         /* last sent packet */
         struct timespec trans_time_mon;