added config parser

Author: algys

CMakeLists.txt

@@ -7,4 +7,4 @@ set(CMAKE_CXX_STANDARD 14)
 include_directories(include/)
 
 file(GLOB SOURCES src/*.cc src/*.c include/*)
-add_executable(http-server ${SOURCES})
+add_executable(http-server ${SOURCES} include/Config.hh src/Config.cc)

conf.txt

@@ -0,0 +1,2 @@
+listen 8080
+document_root ./../http-test-suite/

include/Config.hh

@@ -0,0 +1,16 @@
+#pragma once
+#include <string>
+#include <unordered_map>
+
+
+class Config
+{
+public:
+    Config(std::string const & fileName);
+
+    int getInt(std::string const & key);
+    std::string getStr(std::string const & key);
+
+private:
+    std::unordered_map<std::string, std::string> confMap;
+};

include/HttpServer.hh

@@ -10,7 +10,7 @@ namespace Http {
 
 class HttpServer {
 public:
-    static void init(uint32_t port);
+    static void init(uint32_t port, std::string const & dRoot);
     static HttpServer &instance();
 
     HttpServer(HttpServer const &) = delete;
@@ -20,7 +20,7 @@ public:
 
     void destroy(uint32_t id);
 
-    static uint32_t port_;
+    static uint32_t port;
     static std::string documentRoot;
 
 private:

include/core.h

@@ -36,6 +36,6 @@ enum {
 
 void write_to_data(data_t * dest, char const * src, uint32_t len);
 
-void init(on_accept_cb_t, on_read_cb_t, on_destroy_cb_t);
+void init(int port, on_accept_cb_t, on_read_cb_t, on_destroy_cb_t);
 void need_destroy(uint32_t conn_idx);
 void set_need_read(uint32_t conn_idx, int val);

src/Config.cc

@@ -0,0 +1,41 @@
+#include <fstream>
+#include <sstream>
+#include "Config.hh"
+
+Config::Config(const std::string &fileName) {
+    std::fstream fs;
+    fs.open(fileName);
+
+    if (!fs.is_open())
+        throw std::runtime_error("Can't open conf file");
+
+    std::string line;
+    while (std::getline(fs, line)) {
+        std::stringstream lineStream(line);
+        std::string key, value;
+        lineStream >> key >> value;
+
+        if (key.size() && value.size())
+            confMap[key] = value;
+    }
+}
+
+int Config::getInt(std::string const &key) {
+    auto val = getStr(key);
+
+    int res;
+    std::stringstream ss(val);
+    ss >> res;
+
+    return res;
+}
+
+std::string Config::getStr(std::string const &key) {
+    auto val = confMap.find(key);
+    if (val == confMap.end())
+        throw std::logic_error("Key not exist");
+
+    return val->second;
+}
+
+

src/HttpServer.cc

@@ -14,7 +14,8 @@ long fileSize(std::string const & filename)
 
 namespace Http {
 
-std::string HttpServer::documentRoot = "/home/algys/sources/http-server/http-test-suite";
+std::string HttpServer::documentRoot = ".";
+uint32_t HttpServer::port = 8080;
 
 void HttpServer::onRead(void *udata) {
     if (!udata)
@@ -105,9 +106,11 @@ void HttpServer::destroy(uint32_t id) {
     need_destroy(id);
 }
 
-void HttpServer::init(uint32_t port) {
-    //  HttpServer::port_ = port;
-    ::init(&HttpServer::onAccept, &HttpServer::onRead, &HttpServer::onDestroy);
+void HttpServer::init(uint32_t port, std::string const & dRoot) {
+    HttpServer::port = port;
+    HttpServer::documentRoot = dRoot;
+
+    ::init(port, &HttpServer::onAccept, &HttpServer::onRead, &HttpServer::onDestroy);
     new HttpServer();
 }
 

src/app.cc

@@ -1,9 +1,15 @@
 #include <HttpServer.hh>
+#include <Config.hh>
 
 extern "C" {
 
-int app_init() {
-    Http::HttpServer::init(8080);
+int app_init(int argc, char ** argv) {
+    if (argc < 2)
+        throw std::runtime_error("Too few args");
+
+    auto conf = Config(argv[1]);
+
+    Http::HttpServer::init((uint32_t) conf.getInt("listen"), conf.getStr("document_root"));
 }
 
 }

src/core.c

@@ -58,7 +58,8 @@ static void _init() {
     events = (struct epoll_event *) malloc(sizeof(struct epoll_event) * MAX_EVENTS * 10);
 }
 
-void init(on_accept_cb_t accept_cb, on_read_cb_t read_cb, on_destroy_cb_t destroy_cb) {
+void init(int port, on_accept_cb_t accept_cb, on_read_cb_t read_cb, on_destroy_cb_t destroy_cb) {
+    listen_port = port;
     on_accept_cb = accept_cb;
     on_read_cb = read_cb;
     on_destroy_cb = destroy_cb;
@@ -323,10 +324,10 @@ int loop() {
     return 0;
 }
 
-int main() {
-    extern void app_init(void);
+int main(int argc, char ** argv) {
+    extern void app_init(int, char **);
 
-    app_init();
+    app_init(argc, argv);
 
     loop();
 }