Open Source alternative to Algolia + Pinecone and an Easier-to-Use alternative to ElasticSearch ⚡ 🔍 ✨ Fast, typo tolerant, in-memory fuzzy Search Engine for building delightful search experiences
C++ algoliadatastoreelasticsearchenterprise-searchfacetingfull-text-searchfuzzy-searchgeosearchin-memoryinstantsearchmerchandisingpineconesearchsearch-enginesemantic-searchsimilarity-searchsite-searchsynonymstypo-tolerancevector-search
Fix ip address in slow request logging.
Kishore Nallanb115caa23ab4
diff --git a/include/http_data.h b/include/http_data.hindex 82725c69..1084ebe3 100644--- a/include/http_data.h+++ b/include/http_data.h@@ -234,6 +234,7 @@ struct http_req {std::atomic<bool> is_http_v1;std::atomic<bool> is_diposed;+ std::string client_ip = "0.0.0.0";http_req(): _req(nullptr), route_hash(1),first_chunk_aggregate(true), last_chunk_aggregate(false),@@ -247,12 +248,12 @@ struct http_req {http_req(h2o_req_t* _req, const std::string & http_method, const std::string & path_without_query, uint64_t route_hash,const std::map<std::string, std::string>& params,- std::vector<nlohmann::json>& embedded_params_vec, const std::string& body):+ std::vector<nlohmann::json>& embedded_params_vec, const std::string& body, const std::string& client_ip):_req(_req), http_method(http_method), path_without_query(path_without_query), route_hash(route_hash),params(params), embedded_params_vec(embedded_params_vec),first_chunk_aggregate(true), last_chunk_aggregate(false),chunk_len(0), body(body), body_index(0), data(nullptr), ready(false),- log_index(0), is_diposed(false) {+ log_index(0), is_diposed(false), client_ip(client_ip) {start_ts = std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::system_clock::now().time_since_epoch()).count();@@ -276,7 +277,7 @@ struct http_req {AppMetrics::get_instance().increment_duration(metric_identifier, ms_since_start);AppMetrics::get_instance().increment_write_metrics(route_hash, ms_since_start);- if(config.get_log_slow_requests_time_ms() >= 0 && int(ms_since_start) > config.get_log_slow_requests_time_ms()) {+ if(config.get_log_slow_requests_time_ms() >= 0 && int(ms_since_start) >= config.get_log_slow_requests_time_ms()) {// log slow request if logging is enabledstd::string query_string = "?";for(const auto& kv: params) {@@ -285,13 +286,8 @@ struct http_req {}}std::string full_url_path = metric_identifier + query_string;- std::string req_ip = "0.0.0.0";- if(!is_diposed) {- req_ip = http_req::get_ip_addr(_req).ip;- }-LOG(INFO) << "SLOW REQUEST: " << "(" + std::to_string(ms_since_start) + " ms) "- << req_ip << " " << full_url_path;+ << client_ip << " " << full_url_path;}}}diff --git a/src/http_server.cpp b/src/http_server.cppindex e791d114..0689c939 100644--- a/src/http_server.cpp+++ b/src/http_server.cpp@@ -310,11 +310,18 @@ int HttpServer::catch_all_handler(h2o_handler_t *_h2o_handler, h2o_req_t *req) {std::string metric_identifier = http_method + " " + path_without_query;AppMetrics::get_instance().increment_count(metric_identifier, 1);+ std::string client_ip = "0.0.0.0";++ if(Config::get_instance().get_enable_access_logging() ||+ Config::get_instance().get_log_slow_requests_time_ms() >= 0) {+ client_ip = http_req::get_ip_addr(req).ip;+ }+if(Config::get_instance().get_enable_access_logging()) {uint64_t now = std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::system_clock::now().time_since_epoch()).count();auto epoch_millis = now / 1000;- AppMetrics::get_instance().write_access_log(epoch_millis, http_req::get_ip_addr(req).ip, metric_identifier);+ AppMetrics::get_instance().write_access_log(epoch_millis, client_ip.c_str(), metric_identifier);}// Handle CORS@@ -462,7 +469,8 @@ int HttpServer::catch_all_handler(h2o_handler_t *_h2o_handler, h2o_req_t *req) {}std::shared_ptr<http_req> request = std::make_shared<http_req>(req, rpath->http_method, path_without_query,- route_hash, query_map, embedded_params_vec, body);+ route_hash, query_map, embedded_params_vec, body,+ client_ip);// add custom generator with a dispose function for cleaning up resourcesh2o_custom_generator_t* custom_gen = new h2o_custom_generator_t;