log: introduced additional log level (3) which shows only minimum of information messages

2 files changed, 12 insertions, 12 deletions

diff --git a/accel-pptpd/extra/pppd_compat.c b/accel-pptpd/extra/pppd_compat.c
index d50c929..97a89d0 100644
--- a/accel-pptpd/extra/pppd_compat.c
+++ b/accel-pptpd/extra/pppd_compat.c
@@ -63,7 +63,7 @@ static void ip_pre_up_handler(struct sigchld_handler_t *h, int status)
 	struct pppd_compat_pd_t *pd = container_of(h, typeof(*pd), ip_pre_up_hnd);
 	if (conf_verbose) {
 		log_switch(NULL, pd->ppp);
-		log_ppp_info("pppd_compat: ip-pre-up finished (%i)\n", status);
+		log_ppp_info2("pppd_compat: ip-pre-up finished (%i)\n", status);
 		pd->res = status;
 	}
 	sched_yield();
@@ -75,7 +75,7 @@ static void ip_up_handler(struct sigchld_handler_t *h, int status)
 	struct pppd_compat_pd_t *pd = container_of(h, typeof(*pd), ip_up_hnd);
 	if (conf_verbose) {
 		log_switch(NULL, pd->ppp);
-		log_ppp_info("pppd_compat: ip-up finished (%i)\n", status);
+		log_ppp_info2("pppd_compat: ip-up finished (%i)\n", status);
 	}
 }
 
@@ -84,7 +84,7 @@ static void ip_down_handler(struct sigchld_handler_t *h, int status)
 	struct pppd_compat_pd_t *pd = container_of(h, typeof(*pd), ip_down_hnd);
 	if (conf_verbose) {
 		log_switch(NULL, pd->ppp);
-		log_ppp_info("pppd_compat: ip-down finished (%i)\n", status);
+		log_ppp_info2("pppd_compat: ip-down finished (%i)\n", status);
 	}
 	sched_yield();
 	triton_context_wakeup(pd->ppp->ctrl->ctx);
@@ -95,7 +95,7 @@ static void ip_change_handler(struct sigchld_handler_t *h, int status)
 	struct pppd_compat_pd_t *pd = container_of(h, typeof(*pd), ip_change_hnd);
 	if (conf_verbose) {
 		log_switch(NULL, pd->ppp);
-		log_ppp_info("pppd_compat: ip-change finished (%i)\n", status);
+		log_ppp_info2("pppd_compat: ip-change finished (%i)\n", status);
 	}
 	sched_yield();
 	pd->res = status;
@@ -149,7 +149,7 @@ static void ev_ppp_pre_up(struct ppp_t *ppp)
 			pd->ip_pre_up_hnd.pid = pid;
 			sigchld_register_handler(&pd->ip_pre_up_hnd);
 			if (conf_verbose)
-				log_ppp_info("pppd_compat: ip-pre-up started (pid %i)\n", pid);
+				log_ppp_info2("pppd_compat: ip-pre-up started (pid %i)\n", pid);
 			sigchld_unlock();
 			triton_context_schedule(pd->ppp->ctrl->ctx);
 			pthread_mutex_lock(&pd->ip_pre_up_hnd.lock);
@@ -195,7 +195,7 @@ static void ev_ppp_started(struct ppp_t *ppp)
 			pd->ip_up_hnd.pid = pid;
 			sigchld_register_handler(&pd->ip_up_hnd);
 			if (conf_verbose)
-				log_ppp_info("pppd_compat: ip-up started (pid %i)\n", pid);
+				log_ppp_info2("pppd_compat: ip-up started (pid %i)\n", pid);
 			sigchld_unlock();
 		} else if (pid == 0) {
 			execve(conf_ip_up, argv, env);
@@ -272,7 +272,7 @@ static void ev_ppp_finished(struct ppp_t *ppp)
 		pd->ip_down_hnd.pid = pid;
 		sigchld_register_handler(&pd->ip_down_hnd);
 		if (conf_verbose)
-			log_ppp_info("pppd_compat: ip-down started (pid %i)\n", pid);
+			log_ppp_info2("pppd_compat: ip-down started (pid %i)\n", pid);
 		sigchld_unlock();
 		triton_context_schedule(pd->ppp->ctrl->ctx);
 		pthread_mutex_lock(&pd->ip_down_hnd.lock);
@@ -343,7 +343,7 @@ static void ev_radius_coa(struct ev_radius_t *ev)
 		sigchld_register_handler(&pd->ip_change_hnd);
 		sigchld_unlock();
 		if (conf_verbose)
-			log_ppp_info("pppd_compat: ip-change started (pid %i)\n", pid);
+			log_ppp_info2("pppd_compat: ip-change started (pid %i)\n", pid);
 		triton_context_schedule(pd->ppp->ctrl->ctx);
 		if (!ev->res)
 			ev->res = pd->res;
diff --git a/accel-pptpd/extra/shaper_tbf.c b/accel-pptpd/extra/shaper_tbf.c
index 27b51a1..965fd16 100644
--- a/accel-pptpd/extra/shaper_tbf.c
+++ b/accel-pptpd/extra/shaper_tbf.c
@@ -603,7 +603,7 @@ static void ev_radius_access_accept(struct ev_radius_t *ev)
 	if (down_speed > 0 && up_speed > 0) {
 		if (!install_shaper(ev->ppp->ifname, down_speed, down_burst, up_speed, up_burst)) {
 			if (conf_verbose)
-				log_ppp_info("tbf: installed shaper %i/%i (Kbit)\n", down_speed, up_speed);
+				log_ppp_info2("tbf: installed shaper %i/%i (Kbit)\n", down_speed, up_speed);
 		}
 	}
 }
@@ -651,11 +651,11 @@ static void ev_radius_coa(struct ev_radius_t *ev)
 				return;
 			} else {
 				if (conf_verbose)
-					log_ppp_info("tbf: changed shaper %i/%i (Kbit)\n", down_speed, up_speed);
+					log_ppp_info2("tbf: changed shaper %i/%i (Kbit)\n", down_speed, up_speed);
 			}
 		} else {
 			if (conf_verbose)
-				log_ppp_info("tbf: removed shaper\n");
+				log_ppp_info2("tbf: removed shaper\n");
 		}
 	}
 }
@@ -678,7 +678,7 @@ static void ev_shaper(struct ev_shaper_t *ev)
 		pd->up_speed = up_speed;
 		if (!install_shaper(ev->ppp->ifname, down_speed, down_burst, up_speed, up_burst)) {
 			if (conf_verbose)
-				log_ppp_info("tbf: installed shaper %i/%i (Kbit)\n", down_speed, up_speed);
+				log_ppp_info2("tbf: installed shaper %i/%i (Kbit)\n", down_speed, up_speed);
 		}
 	}
 }