Singleton Config

Author: taszlan

src/Config.cpp

@@ -15,14 +15,20 @@
 std::map<string, string> configMap;
 
 Logger *logger;
+
+Config* Config::getInstance() {
+    static Config configSingleton;
+    return &configSingleton;
+}
+
 Config::Config() {
     queue_size = 10;
     loadConfigFileToMap();
-    logger = new Logger("Config");
-    logger->debug("Ready");
+
 }
 
 
+
 void Config::loadConfigFileToMap(){
     configMap.clear();
     std::string configString;
@@ -83,6 +89,7 @@ Config::~Config() {
 
 
 int Config::get_int_setting(std::string setting_name) {
+    confMutex.lock();
     if(isSigusr1Received){
         Config::loadConfigFileToMap();
         Config::printMapContents();
@@ -96,11 +103,13 @@ int Config::get_int_setting(std::string setting_name) {
 	} catch (invalid_argument){
         throw ConfigException("Error parsing config to int, check config file syntax at " + setting_name);
     }
+    confMutex.unlock();
 	return returnInt;
 }
 
 
 std::string Config::get_str_setting(std::string setting_name) {
+    confMutex.lock();
     if(isSigusr1Received){
         Config::loadConfigFileToMap();
         Config::printMapContents();
@@ -113,5 +122,6 @@ std::string Config::get_str_setting(std::string setting_name) {
     } catch (out_of_range) {
         throw ConfigException("Unknown string option passed: " + setting_name);
     }
+    confMutex.unlock();
     return returnString;
 }

src/Config.h

@@ -1,26 +1,33 @@
 #ifndef SRC_CONFIG_H_
 #define SRC_CONFIG_H_
 
+#include <mutex>
 #include "Common.h"
 #include "globals.h"
+#include "Logger.h"
 
 class Config {
 	private:
 		int queue_size;
-        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();
+        std::string configString;
+        std::string delimiter;
+        std::string configRelevantString;
+        std::string configLine;
+        std::string key;
+        size_t position;
+        void loadConfigFileToMap();
+	    void printMapContents();
+        Config();
+        static Config* configSingleton;
+        static bool isConfigLoggerCreated;
+        std::mutex confMutex;
+
 
 public:
-		Config();
+        static Config* getInstance();
 		virtual ~Config();
-		static int get_int_setting(std::string);
-		static std::string get_str_setting(std::string);
+		int get_int_setting(std::string);
+		std::string get_str_setting(std::string);
 };
 
 class ConfigException: public BaseException {

src/Logger.cpp

@@ -15,8 +15,10 @@
 
 // global
 std::time_t epochTimestamp;
+Config* config;
 
-Logger::Logger(string path, string name) {
+Logger::Logger(string name) {
+    config = Config::getInstance();
     isLoggingToFileEnabled = true;
     std::map<string, int > map;
     map.insert(pair<string, int>("QUIET", 0));
@@ -25,9 +27,9 @@ Logger::Logger(string path, string name) {
     map.insert(pair<string, int>("DEBUG", 3));
     std::string loggerStatus;
     const char* cLoggerStatus;
-    this->current_log_level = map.at(Config::get_str_setting("current_log_level"));
+    this->current_log_level = map.at(config->get_str_setting("current_log_level"));
     this->class_name = name;
-    log_path = path;
+    log_path = config->get_str_setting("log_path");
     logFileDescriptor = open(log_path.c_str(), O_WRONLY | O_APPEND | O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP );
 
     if(logFileDescriptor < 0){

src/Logger.h

@@ -22,9 +22,7 @@ class Logger {
 
 public:
 	Logger() {}
-	Logger(string path, string name);
-	// delegation is fun
-	Logger(string name) : Logger(Config::get_str_setting("log_path"), name) {};
+	Logger(string name);
 	virtual ~Logger();
 	void set_postfix(string postfix);
 

src/Manager.cpp

@@ -10,8 +10,9 @@
 pthread_mutex_t * mutex_pool; // separate locks for each thread
 
 Manager::Manager() {
+    Config* config = Config::getInstance();
     this->logger = new Logger("Manager");
-    this->worker_count = Config::get_int_setting("worker_count");
+    this->worker_count = config->get_int_setting("worker_count");
     this->pool = (pthread_t*)       calloc(worker_count, sizeof(pthread_t));
     mutex_pool = (pthread_mutex_t*) calloc(worker_count, sizeof(pthread_mutex_t));
     for (int i = 0; i < this->worker_count; i++) {

src/server.cpp

@@ -16,16 +16,16 @@
 
 int main() {
 	// Init basic classes
-	CmdLine cmdline;
-	Config config;
+    CmdLine cmdline;
+	Config* config = Config::getInstance();
     Logger logger("Server");
     SignalHandler signalHandler;
 
     logger.info("Process id: " + std::to_string(getpid()));
-    if(config.get_str_setting("start_full_server") == "true") {
+    if(config->get_str_setting("start_full_server") == "true") {
         // starting the full server
-        std::string port = config.get_str_setting("port");
-        int queue_size   = config.get_int_setting("queue_size");
+        std::string port = config->get_str_setting("port");
+        int queue_size   = config->get_int_setting("queue_size");
         logger.info("Starting HackTTP at port: " + port);
 
         try {