From 87f944a7584823f4a69c6a42ef8a2f1e1a7dab39 Mon Sep 17 00:00:00 2001 From: Bhavya Gupta Date: Sun, 22 Sep 2024 12:48:45 +0530 Subject: [PATCH] Update main.cc Added multithreading,configurable parameters and error logging --- docker/main.cc | 59 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 39 insertions(+), 20 deletions(-) diff --git a/docker/main.cc b/docker/main.cc index 512b266..091e689 100644 --- a/docker/main.cc +++ b/docker/main.cc @@ -11,8 +11,10 @@ #include #include #include - #include +#include +#include +#include constexpr auto error_html = R"( {} {} @@ -34,48 +36,65 @@ std::string time_local() { return ss.str(); } -std::string log(auto &req, auto &res) { +std::string log(const httplib::Request &req, const httplib::Response &res) { auto remote_user = "-"; // TODO: auto request = std::format("{} {} {}", req.method, req.path, req.version); auto body_bytes_sent = res.get_header_value("Content-Length"); auto http_referer = "-"; // TODO: auto http_user_agent = req.get_header_value("User-Agent", "-"); - // NOTE: From NGINX defualt access log format - // log_format combined '$remote_addr - $remote_user [$time_local] ' - // '"$request" $status $body_bytes_sent ' - // '"$http_referer" "$http_user_agent"'; + // NOTE: From NGINX default access log format return std::format(R"({} - {} [{}] "{}" {} {} "{}" "{}")", req.remote_addr, remote_user, time_local(), request, res.status, body_bytes_sent, http_referer, http_user_agent); } int main(int argc, const char **argv) { - signal(SIGINT, sigint_handler); + // Default values for host, port, and base directory + std::string base_dir = "./html"; + std::string host = "0.0.0.0"; + int port = 80; - auto base_dir = "./html"; - auto host = "0.0.0.0"; - auto port = 80; + // Parse command-line arguments (if provided) + if (argc > 1) base_dir = argv[1]; + if (argc > 2) host = argv[2]; + if (argc > 3) port = std::stoi(argv[3]); + + // Check if the base directory exists + if (!std::filesystem::exists(base_dir)) { + std::cerr << "Error: Directory " << base_dir << " does not exist." << std::endl; + return 1; // Exit if the directory is invalid + } + + signal(SIGINT, sigint_handler); httplib::Server svr; - svr.set_error_handler([](auto & /*req*/, auto &res) { - auto body = - std::format(error_html, res.status, httplib::status_message(res.status), - CPPHTTPLIB_VERSION); + // Set up multithreading with 8 threads + svr.new_task_queue = [] { return new httplib::ThreadPool(8); }; + // Error handling for 404 and other status codes + svr.set_error_handler([](const httplib::Request & /*req*/, httplib::Response &res) { + auto body = std::format(error_html, res.status, httplib::status_message(res.status), CPPHTTPLIB_VERSION); res.set_content(body, "text/html"); }); - svr.set_logger( - [](auto &req, auto &res) { std::cout << log(req, res) << std::endl; }); + // Set up logging + svr.set_logger([](const httplib::Request &req, const httplib::Response &res) { + std::cout << log(req, res) << std::endl; + }); + // Mount the base directory for serving static files svr.set_mount_point("/", base_dir); - std::cout << std::format("Serving HTTP on {0} port {1} ...", host, port) - << std::endl; + // Start server and handle failures + std::cout << std::format("Serving HTTP on {0} port {1} ...", host, port) << std::endl; + auto ret = svr.listen(host.c_str(), port); - auto ret = svr.listen(host, port); + if (!ret) { + std::cerr << "Error: Failed to start server on " << host << ":" << port << std::endl; + return 1; // Exit with failure code if listen fails + } - return ret ? 0 : 1; + return 0; }