debug: add/move some debug output lines

nodogsplash · Jul 28, 2019 · 963e3f0 · 963e3f0
1 parent cdb941d
commit 963e3f0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/fw_iptables.c b/src/fw_iptables.c
@@ -379,6 +379,8 @@ iptables_fw_init(void)
 	int rc = 0;
 	int macmechanism;
 
+	debug(LOG_NOTICE, "Initializing firewall rules");
+
 	LOCK_CONFIG();
 	config = config_get_config();
 	gw_interface = safe_strdup(config->gw_interface); /* must free */
@@ -794,7 +796,7 @@ iptables_fw_destroy_mention(
 	char rulenum[10];
 	int retval = -1;
 
-	debug(LOG_DEBUG, "Checking all mention of %s from %s.%s", mention, table, chain);
+	debug(LOG_DEBUG, "Checking all mention of %s in table %s of chain %s", mention, table, chain);
 
 	config = config_get_config();
 	iptables = config->ip6 ? "ip6tables" : "iptables";

diff --git a/src/main.c b/src/main.c
@@ -188,7 +188,7 @@ init_signals(void)
 		exit(1);
 	}
 
-	debug(LOG_DEBUG, "Setting SIGTERM,SIGQUIT,SIGINT  handlers to termination_handler()");
+	debug(LOG_DEBUG, "Setting SIGTERM, SIGQUIT, SIGINT  handlers to termination_handler()");
 	sa.sa_handler = termination_handler;
 	sigemptyset(&sa.sa_mask);
 	sa.sa_flags = SA_RESTART;
@@ -368,7 +368,6 @@ main_loop(void)
 	iptables_fw_destroy();
 
 	/* Then initialize it */
-	debug(LOG_NOTICE, "Initializing firewall rules");
 	if (iptables_fw_init() != 0) {
 		debug(LOG_ERR, "Error initializing firewall rules! Cleaning up");
 		iptables_fw_destroy();