From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Tue, 5 Nov 2019 20:55:29 +0000 (-0600)
Subject: We only get "waking up" messages at DEBUG4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c056ec7c65fbb09896df8484e8b44f15438ea2f;p=thirdparty%2Ffreeradius-server.git

We only get "waking up" messages at DEBUG4
---

diff --git a/src/bin/radiusd.c b/src/bin/radiusd.c
index 525951125ad..51b30857e32 100644
--- a/src/bin/radiusd.c
+++ b/src/bin/radiusd.c
@@ -185,7 +185,6 @@ int main(int argc, char *argv[])
 	void		*pool_page_start = NULL, *pool_page_end = NULL;
 	bool		do_mprotect;
 	dl_module_loader_t *dl_modules = NULL;
-	bool		sync_time = true;
 
 	/*
 	 *	Setup talloc callbacks so we get useful errors
@@ -384,7 +383,6 @@ int main(int argc, char *argv[])
 			break;
 
 		case 'X':
-			sync_time = false;
 			config->spawn_workers = false;
 			config->daemonize = false;
 			fr_debug_lvl += 2;
@@ -865,14 +863,7 @@ int main(int argc, char *argv[])
 		DEBUG("Global memory protected");
 	}
 
-	/*
-	 *	Sync timers normally, but not when running with
-	 *	`radiusd -X`. For debug mode, we don't really care if
-	 *	the times are off a little bit.  And skipping this
-	 *	timer means that we don't pollute the debug output
-	 *	with lots of "waking up in 1s".
-	 */
-	if (sync_time) fr_time_sync_event(main_loop_event_list(), fr_time(), NULL);
+	fr_time_sync_event(main_loop_event_list(), fr_time(), NULL);
 
 	/*
 	 *	Prevent anything from modifying the dictionaries
diff --git a/src/lib/server/main_loop.c b/src/lib/server/main_loop.c
index 2e4a0ea0e03..e23f7cc308d 100644
--- a/src/lib/server/main_loop.c
+++ b/src/lib/server/main_loop.c
@@ -236,7 +236,7 @@ static int _loop_status(UNUSED void *ctx, fr_time_t wake)
 		INFO("Ready to process requests");
 
 	} else if (wake > (NSEC / 10)) {
-		DEBUG4("Waking up in %pV seconds.", fr_box_time_delta(wake));
+		DEBUG4("Waking up in %pV seconds", fr_box_time_delta(wake));
 	}
 
 	return 0;