Fixed log file creation.

Dropped LoggerBase (not needed anymore).
Added Logger constructor with default from config (and restored simpler instantiation in Manager/Router/Worker).
Added class name to our exception what() string
Added basic exception logging/handling in main server (now the server terminates correctly, not by segfaulting).

Author: lh5053

src/Exceptions.h

@@ -1,8 +1,10 @@
 #ifndef SRC_EXCEPTIONS_H_
 #define SRC_EXCEPTIONS_H_
 
+#include <cxxabi.h>
 #include <exception>
 #include <iostream>
+#include <typeinfo>
 
 // Possibly we could also add a stack trace here:
 // http://stackoverflow.com/questions/353180/how-do-i-find-the-name-of-the-calling-function
@@ -13,8 +15,12 @@ class BaseException: public std::exception {
         BaseException(std::string msg = "Unknown exception") {
             this->reason = msg;
         }
+        std::string name() const {
+            int status;
+            return abi::__cxa_demangle(typeid(*this).name(), 0, 0, &status);
+        }
         virtual const char* what() const throw() {
-            return reason.c_str();
+            return (name() + ": " + reason).c_str();
         }
 };
 

src/Logger.cpp

@@ -20,20 +20,7 @@ std::time_t epochTimestamp;
 int logFileDescriptor;
 std::mutex mut;
 
-//Po co jest LoggerBase?
-
-LoggerBase::LoggerBase(std::string path) {
-	log_path = path;
-}
-
-LoggerBase::~LoggerBase() {
-}
-
-Logger::Logger(std::string name) {
-	this->class_name = name;
-}
-
-Logger::Logger(std::string path, std::string name) : LoggerBase(path) {
+Logger::Logger(std::string path, std::string name) {
     std::map<string, int > map;
     map.insert(pair<string, int>("QUIET", 0));
     map.insert(pair<string, int>("WARNINGS", 1));
@@ -43,17 +30,14 @@ Logger::Logger(std::string path, std::string name) : LoggerBase(path) {
     const char* cLoggerStatus;
     this->current_log_level = map.at(Config::get_str_setting("current_log_level"));
     this->class_name = name;
-    logFileDescriptor = open(log_path.c_str(), O_WRONLY | O_APPEND);
+    log_path = path;
+    logFileDescriptor = open(log_path.c_str(), O_WRONLY | O_APPEND | O_CREAT );
 
     if(logFileDescriptor < 0){
-        loggerStatus = "[" + this->class_name + "]" + " Error opening logfile, disabling logging to file\nError: " + strerror(errno) + "\n";
+        loggerStatus = "[" + this->class_name + "]" + " Error opening logfile at "+log_path+", disabling logging to file\nError: " + strerror(errno) + "\n";
         cLoggerStatus = loggerStatus.c_str();
         write(2, cLoggerStatus, strlen(cLoggerStatus));
         isLoggingToFileEnabled = false;
-    } else {
-        loggerStatus = "[" + this->class_name + "]" + " Logfile is open, logging to file enabled\n";
-        cLoggerStatus = loggerStatus.c_str();
-        write(1, cLoggerStatus, strlen(cLoggerStatus));
     }
 }
 

src/Logger.h

@@ -1,25 +1,16 @@
 #ifndef SRC_LOGGER_H_
 #define SRC_LOGGER_H_
 #include <string>
+#include "Config.h"
 #define QUIET 0
 #define WARNINGS 1
 #define INFO 2
 #define DEBUG 3
-//enum LogLevel { QUIET, WARNINGS, INFO, DEBUG };
 
-class LoggerBase {
+class Logger {
 protected:
-	int current_log_level = DEBUG;
-public:
-	LoggerBase() {}
-	LoggerBase(std::string path);
-	virtual ~LoggerBase();
-
-	virtual void _log(std::string msg, int level) {}
-	virtual void info(std::string msg) {}
-};
+    int current_log_level = DEBUG;
 
-class Logger : public LoggerBase {
 private:
 	std::string class_name;
 	std::string fullMessage;
@@ -28,8 +19,9 @@ class Logger : public LoggerBase {
 
 public:
 	Logger() {}
-	Logger(std::string name);
 	Logger(std::string path, std::string name);
+	// delegation is fun
+	Logger(std::string name) : Logger(Config::get_str_setting("log_path"), name) {};
 	virtual ~Logger();
 
 	void _log(std::string msg, int level);

src/Manager.cpp

@@ -17,7 +17,7 @@
 pthread_mutex_t * mutex_pool; // separate locks for each thread
 
 Manager::Manager() {
-    this->logger = new Logger(Config::get_str_setting("log_path"), "Manager");
+    this->logger = new Logger("Manager");
     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));

src/Router.cpp

@@ -21,7 +21,7 @@
 
 Router::Router(int qsize, std::string port) {
 	this->queue_size = qsize;
-	this->logger = new Logger(Config::get_str_setting("log_path"), "Router");
+	this->logger = new Logger("Router");
 	this->port = port;
     // initialize the socket
 	this->listening_socket_fd = this->init_socket();

src/Worker.cpp

@@ -20,7 +20,7 @@
  */
 
 Worker::Worker(int socket_fd) {
-    this->logger = new Logger(Config::get_str_setting("log_path"), "Worker");
+    this->logger = new Logger("Worker");
     this->socket_fd = socket_fd;
 }
 

src/server.cpp

@@ -1,8 +1,8 @@
 #include <iostream>
 #include "CmdLine.h"
 #include "Config.h"
-#include "Router.h"
 #include "Logger.h"
+#include "Router.h"
 
 /*
  * "main" - should use other modules for everything, that is:
@@ -16,17 +16,25 @@ int main() {
 	// Init basic classes
 	CmdLine cmdline;
 	Config config;
-    Logger logger(Config::get_str_setting("log_path"), "Server");
+    Logger logger("Server");
     //"hello from server.cpp" message, to be removed
     logger.info(config.get_str_setting("config_test"));
 
     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");
         logger.info("Starting HackTTP at port: " + port);
 
-        Router router(config.get_int_setting("queue_size"), port);
-        router.watch();
+        try {
+            Router router(queue_size, port);
+            router.watch();
+        }
+        catch (BaseException &e) {
+            logger.warn(
+                std::string(e.what()) + ", terminating server..."
+            );
+        }
     } else {
         logger.info("Running in test mode");
     }