From 0815aea6fd78a84d2db9131ef6614fb467e83ba3 Mon Sep 17 00:00:00 2001 From: KimLS Date: Wed, 10 Dec 2025 00:05:58 -0800 Subject: [PATCH] Sidecar stuff wont directly include cpp files now too. --- zone/sidecar_api/log_handler.cpp | 18 ----------- zone/sidecar_api/map_best_z_controller.cpp | 4 --- zone/sidecar_api/sidecar_api.cpp | 36 ++++++++++++++++++++-- zone/sidecar_api/test_controller.cpp | 10 ------ 4 files changed, 33 insertions(+), 35 deletions(-) delete mode 100644 zone/sidecar_api/log_handler.cpp delete mode 100644 zone/sidecar_api/map_best_z_controller.cpp delete mode 100644 zone/sidecar_api/test_controller.cpp diff --git a/zone/sidecar_api/log_handler.cpp b/zone/sidecar_api/log_handler.cpp deleted file mode 100644 index 5c0e47c01..000000000 --- a/zone/sidecar_api/log_handler.cpp +++ /dev/null @@ -1,18 +0,0 @@ -void SidecarApi::RequestLogHandler(const httplib::Request &req, const httplib::Response &res) -{ - if (!req.path.empty()) { - std::vector params; - for (auto &p: req.params) { - params.emplace_back(fmt::format("{}={}", p.first, p.second)); - } - - LogInfo( - "[API] Request [{}] [{}{}] via [{}:{}]", - res.status, - req.path, - (!params.empty() ? "?" + Strings::Join(params, "&") : ""), - req.remote_addr, - req.remote_port - ); - } -} diff --git a/zone/sidecar_api/map_best_z_controller.cpp b/zone/sidecar_api/map_best_z_controller.cpp deleted file mode 100644 index abb714ac5..000000000 --- a/zone/sidecar_api/map_best_z_controller.cpp +++ /dev/null @@ -1,4 +0,0 @@ -void SidecarApi::MapBestZController(const httplib::Request &req, httplib::Response &res) -{ - -} diff --git a/zone/sidecar_api/sidecar_api.cpp b/zone/sidecar_api/sidecar_api.cpp index d6e6596c9..583506798 100644 --- a/zone/sidecar_api/sidecar_api.cpp +++ b/zone/sidecar_api/sidecar_api.cpp @@ -16,9 +16,39 @@ void CatchSidecarSignal(int sig_num) std::exit(0); } -#include "log_handler.cpp" -#include "test_controller.cpp" -#include "map_best_z_controller.cpp" +void SidecarApi::RequestLogHandler(const httplib::Request& req, const httplib::Response& res) +{ + if (!req.path.empty()) { + std::vector params; + for (auto& p : req.params) { + params.emplace_back(fmt::format("{}={}", p.first, p.second)); + } + + LogInfo( + "[API] Request [{}] [{}{}] via [{}:{}]", + res.status, + req.path, + (!params.empty() ? "?" + Strings::Join(params, "&") : ""), + req.remote_addr, + req.remote_port + ); + } +} + +void SidecarApi::TestController(const httplib::Request& req, httplib::Response& res) +{ + nlohmann::json j; + + j["data"]["test"] = "test"; + + res.set_content(j.dump(), "application/json"); +} + +void SidecarApi::MapBestZController(const httplib::Request& req, httplib::Response& res) +{ + +} + #include "../../common/file.h" constexpr static int HTTP_RESPONSE_OK = 200; diff --git a/zone/sidecar_api/test_controller.cpp b/zone/sidecar_api/test_controller.cpp deleted file mode 100644 index a1cb7d4a7..000000000 --- a/zone/sidecar_api/test_controller.cpp +++ /dev/null @@ -1,10 +0,0 @@ -#include "sidecar_api.h" - -void SidecarApi::TestController(const httplib::Request &req, httplib::Response &res) -{ - nlohmann::json j; - - j["data"]["test"] = "test"; - - res.set_content(j.dump(), "application/json"); -}