SIGUSR1 reloads Config on next use

Author: taszlan

src/Config.cpp

@@ -17,10 +17,19 @@ std::map<string, string> configMap;
 
 Config::Config() {
     loadConfigFileToMap();
+    printMapContents();
 }
 
 
 void Config::loadConfigFileToMap(){
+    configMap.clear();
+    std::string configString;
+    std::string delimiter;
+    std::string configRelevantString;
+    std::string configLine;
+    std::string key;
+    size_t position;
+
     int configFileDescriptor = open("./config", O_RDONLY);
     char configFileContents[CONFIG_SIZE];
     read(configFileDescriptor, &configFileContents, CONFIG_SIZE);
@@ -52,11 +61,23 @@ void Config::loadConfigFileToMap(){
     }
 }
 
+void Config::printMapContents(){
+    cout << "Currently loaded Config:" << endl;
+    for (const auto &p : configMap) {
+        std::cout << "[" << p.first << "] = " << p.second << '\n';
+    }
+}
+
 Config::~Config() {
 }
 
 
 int Config::get_int_setting(std::string setting_name) {
+    if(isSigusr1Recieved){
+        Config::loadConfigFileToMap();
+        Config::printMapContents();
+        isSigusr1Recieved = false;
+    }
 	int returnInt = -1;
     try {
         returnInt = std::stoi(configMap.at(setting_name));
@@ -70,6 +91,11 @@ int Config::get_int_setting(std::string setting_name) {
 
 
 std::string Config::get_str_setting(std::string setting_name) {
+    if(isSigusr1Recieved){
+        Config::loadConfigFileToMap();
+        Config::printMapContents();
+        isSigusr1Recieved = false;
+    }
     std::string returnString;
 
     try{

src/Config.h

@@ -10,13 +10,14 @@ class Config {
 	private:
 		// to be replaced with some dynamic map struct
 		int queue_size = 10;
-        std::string configString;
-        std::string delimiter;
-        std::string configRelevantString;
-        std::string configLine;
-        std::string key;
-        size_t position;
-        void loadConfigFileToMap();
+        static std::string configString;
+        static std::string delimiter;
+        static std::string configRelevantString;
+        static std::string configLine;
+        static std::string key;
+        static size_t position;
+        static void loadConfigFileToMap();
+	    static void printMapContents();
 
 public:
 		Config();

src/SignalHandler.cpp

@@ -8,25 +8,47 @@
 #include "SignalHandler.h"
 #include "globals.h"
 
-void SignalHandler::signalHandler(int sig, siginfo_t *siginfo, void *context){
-    std::cout << "Signal recieved: SignalHandler" << std::endl;
+bool isSigintRecieved;
+bool isSigusr1Recieved;
+
+void SignalHandler::sigintHandler(int sig, siginfo_t *siginfo, void *context){
+    std::cout << "SignalHandler: Signal recieved - SIGINT" << std::endl;
     isSigintRecieved = true;
 }
 
+void SignalHandler::sigusr1Handler(int sig, siginfo_t *siginfo, void *context){
+    std::cout << "SignalHandler: Signal recieved - SIGUSR1, Config will be reloaded on next use." << std::endl;
+    isSigusr1Recieved = true;
+}
+
 SignalHandler::~SignalHandler() {
 
 }
 
 SignalHandler::SignalHandler() {
+    isSigintRecieved = false;
+    isSigusr1Recieved = false;
+
+    struct sigaction sigintStruct;
+    memset (&sigintStruct, '\0', sizeof(sigintStruct));
+    /* Use the sa_sigaction field because the handles has two additional parameters */
+    sigintStruct.sa_sigaction = &sigintHandler;
+    /* The SA_SIGINFO flag tells sigaction() to use the sa_sigaction field, not sa_handler. */
+    sigintStruct.sa_flags = SA_SIGINFO;
 
-    struct sigaction act;
-    memset (&act, '\0', sizeof(act));
+    if (sigaction(SIGINT, &sigintStruct, NULL) < 0) {
+        std::cout <<"Signal error" <<std::endl;
+    }
+
+    struct sigaction sigusr1Struct;
+    memset (&sigusr1Struct, '\0', sizeof(sigusr1Struct));
     /* Use the sa_sigaction field because the handles has two additional parameters */
-    act.sa_sigaction = &signalHandler;
+    sigusr1Struct.sa_sigaction = &sigusr1Handler;
     /* The SA_SIGINFO flag tells sigaction() to use the sa_sigaction field, not sa_handler. */
-    act.sa_flags = SA_SIGINFO;
+    sigusr1Struct.sa_flags = SA_SIGINFO | SA_RESTART;
 
-    if (sigaction(SIGINT, &act, NULL) < 0) {
+    if (sigaction(SIGUSR1, &sigusr1Struct, NULL) < 0) {
         std::cout <<"Signal error" <<std::endl;
     }
+
 }

src/SignalHandler.h

@@ -11,7 +11,8 @@ class SignalHandler{
 public:
     virtual ~SignalHandler();
     SignalHandler();
-    static void signalHandler(int, siginfo_t*, void*);
+    static void sigintHandler(int, siginfo_t *, void *);
+    static void sigusr1Handler(int, siginfo_t *, void *);
 };
 
 #endif //HACKTTP_SIGNALHANDLER_H

src/globals.h

@@ -6,5 +6,6 @@
 #define HACKTTP_GLOBALS_H_H
 
 extern bool isSigintRecieved;
+extern bool isSigusr1Recieved;
 
 #endif //HACKTTP_GLOBALS_H_H

src/server.cpp

@@ -14,10 +14,8 @@
  *	- bind the router tho the receiving port and give it control
  *	- when router finishes, log and shutdown
  */
-bool isSigintRecieved;
 
 int main() {
-    isSigintRecieved = false;
 	// Init basic classes
     SignalHandler signalHandler;
 	CmdLine cmdline;