2 files changed, 9 insertions, 3 deletions
diff --git a/src/log.c b/src/log.c
index 3a87b936..1651f38d 100644
--- a/src/log.c
+++ b/src/log.c
@@ -92,10 +92,13 @@ void connman_debug(const char *format, ...)
 
 void __connman_toggle_debug(void)
 {
-	if (debug_enabled == TRUE)
+	if (debug_enabled == TRUE) {
+		connman_info("Disabling debug output");
 		debug_enabled = FALSE;
-	else
+	} else {
+		connman_info("Enabling debug output");
 		debug_enabled = TRUE;
+	}
 }
 
 int __connman_log_init(gboolean detach, gboolean debug)
@@ -109,7 +112,8 @@ int __connman_log_init(gboolean detach, gboolean debug)
 
 	syslog(LOG_INFO, "Connection Manager version %s", VERSION);
 
-	debug_enabled = debug;
+	if (debug == TRUE)
+		__connman_toggle_debug();
 
 	return 0;
 }
diff --git a/src/main.c b/src/main.c
index fe411834..7793938d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -40,6 +40,8 @@ static GMainLoop *main_loop = NULL;
 
 static void sig_term(int sig)
 {
+	connman_info("Terminating");
+
 	g_main_loop_quit(main_loop);
 }