From c58f4100ccc7628866a8c5779fd44f6e2376e029 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Thu, 5 Sep 2024 20:08:24 +0900 Subject: [PATCH 1/2] timesync: downgrade log level about network configuration change These message may be unnecessarily shown multiple times when e.g. networkd is restarted, system is wakeup from suspend, and so on. Closes #34262. --- src/timesync/timesyncd-manager.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c index 5f16ed2b94..32eee91a27 100644 --- a/src/timesync/timesyncd-manager.c +++ b/src/timesync/timesyncd-manager.c @@ -1052,11 +1052,15 @@ static int manager_network_event_handler(sd_event_source *s, int fd, uint32_t re connected = manager_is_connected(m); if (connected && !online) { - log_info("No network connectivity, watching for changes."); + /* When m->talking is false, we have not received any responses from the server, + * and it is not necessary to log about disconnection. */ + log_full(m->talking ? LOG_INFO : LOG_DEBUG, + "No network connectivity, watching for changes."); manager_disconnect(m); } else if ((!connected || changed) && online) { - log_info("Network configuration changed, trying to establish connection."); + log_full(connected ? LOG_DEBUG : LOG_INFO, + "Network configuration changed, trying to establish connection."); if (m->current_server_address) r = manager_begin(m); From b9f208643b095ea92ea17914bd8664c8adffe0b7 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 6 Sep 2024 10:20:21 +0900 Subject: [PATCH 2/2] timesync: make manager_is_connected() static --- src/timesync/timesyncd-manager.c | 2 +- src/timesync/timesyncd-manager.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c index 32eee91a27..5cec9c9f84 100644 --- a/src/timesync/timesyncd-manager.c +++ b/src/timesync/timesyncd-manager.c @@ -1027,7 +1027,7 @@ clear: return r; } -bool manager_is_connected(Manager *m) { +static bool manager_is_connected(Manager *m) { assert(m); /* Return true when the manager is sending a request, resolving a server name, or diff --git a/src/timesync/timesyncd-manager.h b/src/timesync/timesyncd-manager.h index 4313d72ce4..68fc8f8853 100644 --- a/src/timesync/timesyncd-manager.h +++ b/src/timesync/timesyncd-manager.h @@ -131,7 +131,6 @@ void manager_flush_runtime_servers(Manager *m); int manager_connect(Manager *m); void manager_disconnect(Manager *m); -bool manager_is_connected(Manager *m); int manager_setup_save_time_event(Manager *m);