Static functions in Config

Author: taszlan

src/Config.cpp

@@ -68,6 +68,8 @@ int Config::get_int_setting(std::string setting_name) {
 
 
 std::string Config::get_str_setting(std::string setting_name) {
+    std::string returnString;
+
     try{
         returnString = configMap.at(setting_name);
     } catch (out_of_range) {

src/Config.h

@@ -13,15 +13,14 @@ class Config {
         std::string configRelevantString;
         std::string configLine;
         std::string key;
-        std::string returnString;
         size_t position;
         void loadConfigFileToMap();
 
 public:
 		Config();
 		virtual ~Config();
-		int get_int_setting(std::string);
-		std::string get_str_setting(std::string);
+		static int get_int_setting(std::string);
+		static std::string get_str_setting(std::string);
 };
 
 using namespace std;

src/Manager.cpp

@@ -8,6 +8,7 @@
 
 #include "Manager.h"
 #include "Worker.h"
+#include "Config.h"
 /*
  * manager - keeps track of workers, their current status, should handle zombies (number of workers comes from config)
  */
@@ -16,7 +17,7 @@
 pthread_mutex_t * mutex_pool; // separate locks for each thread
 
 Manager::Manager() {
-    this->logger = Logger("Manager");
+    this->logger = Logger(Config::get_str_setting("log_path"), "Manager");
     // TODO Move to config file and fetch directly from there
     this->worker_count = 10;
     this->pool = (pthread_t*)       calloc(worker_count, sizeof(pthread_t));

src/Router.cpp

@@ -11,6 +11,7 @@
 
 #include "Router.h"
 #include "Manager.h"
+#include "Config.h"
 
 /*
  * router - watches the designated port and for launches a new worker for every connection
@@ -20,7 +21,7 @@
 
 Router::Router(int qsize, std::string port) {
 	this->queue_size = qsize;
-	this->logger = Logger("Router");
+	this->logger = Logger(Config::get_str_setting("log_path"), "Router");
 	this->port = port;
     // initialize the socket
 	this->listening_socket_fd = this->init_socket();

src/Worker.cpp

@@ -11,6 +11,7 @@
 
 #include "Worker.h"
 #include "BasicHTTP.h"
+#include "Config.h"
 
 #define HTTP_REQUEST_LENGTH 8192
 
@@ -19,7 +20,7 @@
  */
 
 Worker::Worker(int socket_fd) {
-    this->logger = Logger("Worker");
+    this->logger = Logger(Config::get_str_setting("log_path"), "Worker");
     this->socket_fd = socket_fd;
 }
 

src/server.cpp

@@ -16,7 +16,7 @@ int main() {
 	// Init basic classes
 	CmdLine cmdline;
 	Config config;
-    Logger logger(config.get_str_setting("log_path"), "Server");
+    Logger logger(Config::get_str_setting("log_path"), "Server");
     //"hello from server.cpp" message, to be removed
     logger.info(config.get_str_setting("config_test"));