From 2a61e7781095f7da1b2252df1aaeec7b520a7683 Mon Sep 17 00:00:00 2001
From: Bogomil Vasilev <smirky@smirky.net>
Date: Sun, 13 Jan 2019 14:33:50 +0200
Subject: [PATCH] RMPS: more logging improvements

---
 src/agent_pool.c | 3 ++-
 src/rmps.c       | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/agent_pool.c b/src/agent_pool.c
index 3eb62f0..e17ad4e 100644
--- a/src/agent_pool.c
+++ b/src/agent_pool.c
@@ -75,6 +75,7 @@ static void *servlet(void *args)  /* Serve the connection -- threadable */
 		log(WARNING, "SSL_accept() failed. Reason below:");
 		log_ssl();
 	} else {
+		log(INFO, "Agent [%s] has connected.", agent->ip);
 		show_certs(agent->ssl);
 		do {
 			buf.meta.type = GET_OS;
@@ -96,7 +97,7 @@ static void *servlet(void *args)  /* Serve the connection -- threadable */
 			}
 			if (SSL_get_shutdown(agent->ssl)
 					== SSL_RECEIVED_SHUTDOWN)
-				log(VERBOSE, "Agent [%s] has shutdown.",
+				log(INFO, "Agent [%s] has shutdown.",
 					agent->ip);
 			else {
 				log(VERBOSE, "Client didn't send data!");
diff --git a/src/rmps.c b/src/rmps.c
index 8d1813d..007f5ca 100644
--- a/src/rmps.c
+++ b/src/rmps.c
@@ -67,13 +67,17 @@ static void signal_handler(int sig)
 		log(WARNING, "Received SIGHUP signal. Ignoring...");
 		break;
 	case SIGINT:
+		log(INFO, "Received SIGINT signal.");
+		log(INFO, "RMPS is shutting down...");
+		rmps_shutdown();
+		log(INFO, "RMPS has been stopped properly.");
+		_exit(EXIT_SUCCESS);
 	case SIGTERM:
 		log(INFO, "Received SIGTERM signal.");
 		log(INFO, "RMPS is shutting down...");
 		rmps_shutdown();
 		log(INFO, "RMPS has been stopped properly.");
 		_exit(EXIT_SUCCESS);
-		break;
 	default:
 		log(WARNING, "Unhandled signal %s", strsignal(sig));
 		break;