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
Make Typesense version a member.
kishorenc1bae5bead613
diff --git a/include/http_server.h b/include/http_server.hindex 9a563082..35cc6053 100644--- a/include/http_server.h+++ b/include/http_server.h@@ -31,6 +31,8 @@ private:h2o_multithread_receiver_t* message_receiver;bool exit_loop = false;+ std::string version;+std::vector<route_path> routes;std::map<std::string, void (*)(void*)> message_handlers;@@ -67,8 +69,9 @@ private:static int send_401_unauthorized(h2o_req_t *req);public:- HttpServer(std::string listen_address, uint32_t listen_port,- std::string ssl_cert_path, std::string ssl_cert_key_path, bool cors_enabled);+ HttpServer(const std::string & version,+ const std::string & listen_address, uint32_t listen_port,+ const std::string & ssl_cert_path, const std::string & ssl_cert_key_path, bool cors_enabled);~HttpServer();@@ -103,6 +106,8 @@ public:static void on_stop_server(void *data);+ std::string get_version();+static constexpr const char* AUTH_HEADER = "x-typesense-api-key";static constexpr const char* STOP_SERVER_MESSAGE = "STOP_SERVER";};\ No newline at end of filediff --git a/include/typesense_server_utils.h b/include/typesense_server_utils.hindex 9e4aba1c..44a645eb 100644--- a/include/typesense_server_utils.h+++ b/include/typesense_server_utils.h@@ -21,6 +21,6 @@ bool directory_exists(const std::string & dir_path);void init_cmdline_options(cmdline::parser & options, int argc, char **argv);-int init_logger(Config & config, std::unique_ptr<g3::LogWorker> & log_worker);+int init_logger(Config & config, const std::string & server_version, std::unique_ptr<g3::LogWorker> & log_worker);-int run_server(Config & config, void (*master_server_routes)(), void (*replica_server_routes)());\ No newline at end of file+int run_server(Config & config, const std::string & version, void (*master_server_routes)(), void (*replica_server_routes)());\ No newline at end of filediff --git a/src/collection_manager.cpp b/src/collection_manager.cppindex ddfe6c10..e9bc3378 100644--- a/src/collection_manager.cpp+++ b/src/collection_manager.cpp@@ -95,7 +95,7 @@ Option<bool> CollectionManager::init(Store *store,Collection* collection = init_collection(collection_meta, collection_next_seq_id);- LOG(INFO) << "Loading collection " << collection->get_name() << std::endl;+ LOG(INFO) << "Loading collection " << collection->get_name();// initialize overridesstd::vector<std::string> collection_override_jsons;diff --git a/src/core_api.cpp b/src/core_api.cppindex 66f1f290..8bbe0f79 100644--- a/src/core_api.cpp+++ b/src/core_api.cpp@@ -152,7 +152,7 @@ void del_drop_collection(http_req & req, http_res & res) {void get_debug(http_req & req, http_res & res) {nlohmann::json result;- result["version"] = TYPESENSE_VERSION;+ result["version"] = res.server->get_version();res.send_200(result.dump());}diff --git a/src/http_server.cpp b/src/http_server.cppindex 76e07baf..d8133826 100644--- a/src/http_server.cpp+++ b/src/http_server.cpp@@ -27,10 +27,11 @@ struct h2o_custom_generator_t {void* data;};-HttpServer::HttpServer(std::string listen_address, uint32_t listen_port, std::string ssl_cert_path,- std::string ssl_cert_key_path, bool cors_enabled):- listen_address(listen_address), listen_port(listen_port), ssl_cert_path(ssl_cert_path),- ssl_cert_key_path(ssl_cert_key_path), cors_enabled(cors_enabled) {+HttpServer::HttpServer(const std::string & version, const std::string & listen_address,+ uint32_t listen_port, const std::string & ssl_cert_path,+ const std::string & ssl_cert_key_path, bool cors_enabled):+ version(version), listen_address(listen_address), listen_port(listen_port),+ ssl_cert_path(ssl_cert_path), ssl_cert_key_path(ssl_cert_key_path), cors_enabled(cors_enabled) {accept_ctx = new h2o_accept_ctx_t();h2o_config_init(&config);hostconf = h2o_config_register_host(&config, h2o_iovec_init(H2O_STRLIT("default")), 65535);@@ -154,6 +155,10 @@ void HttpServer::on_stop_server(void *data) {// do nothing}+std::string HttpServer::get_version() {+ return version;+}+void HttpServer::clear_timeouts(const std::vector<h2o_timeout_t*> & timeouts) {for(h2o_timeout_t* timeout: timeouts) {while (!h2o_linklist_is_empty(&timeout->_entries)) {diff --git a/src/main/typesense_server.cpp b/src/main/typesense_server.cppindex a2887475..f2f7c206 100644--- a/src/main/typesense_server.cpp+++ b/src/main/typesense_server.cpp@@ -66,11 +66,5 @@ int main(int argc, char **argv) {exit(1);}- std::unique_ptr<g3::LogWorker> log_worker = g3::LogWorker::createLogWorker();- int ret_code = init_logger(config, log_worker);- if(ret_code != 0) {- return ret_code;- }-- return run_server(config, &master_server_routes, &replica_server_routes);+ return run_server(config, TYPESENSE_VERSION, &master_server_routes, &replica_server_routes);}\ No newline at end of filediff --git a/src/typesense_server_utils.cpp b/src/typesense_server_utils.cppindex e947be90..107dd691 100644--- a/src/typesense_server_utils.cpp+++ b/src/typesense_server_utils.cpp@@ -38,7 +38,7 @@ void init_cmdline_options(cmdline::parser & options, int argc, char **argv) {options.add<std::string>("config", '\0', "Path to the configuration file.", false, "");}-int init_logger(Config & config, std::unique_ptr<g3::LogWorker> & log_worker) {+int init_logger(Config & config, const std::string & server_version, std::unique_ptr<g3::LogWorker> & log_worker) {// remove SIGTERM since we handle it on our owng3::overrideSetupSignals({{SIGABRT, "SIGABRT"}, {SIGFPE, "SIGFPE"},{SIGILL, "SIGILL"}, {SIGSEGV, "SIGSEGV"},});@@ -60,7 +60,7 @@ int init_logger(Config & config, std::unique_ptr<g3::LogWorker> & log_worker) {log_worker->addDefaultLogger("typesense", log_dir, "");- std::cout << "Starting Typesense " << TYPESENSE_VERSION << ". Log directory is configured as: "+ std::cout << "Starting Typesense " << server_version << ". Log directory is configured as: "<< log_dir << std::endl;}@@ -69,8 +69,16 @@ int init_logger(Config & config, std::unique_ptr<g3::LogWorker> & log_worker) {return 0;}-int run_server(Config & config, void (*master_server_routes)(), void (*replica_server_routes)()) {- LOG(INFO) << "Starting Typesense " << TYPESENSE_VERSION << std::flush;+int run_server(Config & config, const std::string & version,+ void (*master_server_routes)(), void (*replica_server_routes)()) {++ std::unique_ptr<g3::LogWorker> log_worker = g3::LogWorker::createLogWorker();+ int ret_code = init_logger(config, version, log_worker);+ if(ret_code != 0) {+ return ret_code;+ }++ LOG(INFO) << "Starting Typesense " << version << std::flush;if(!directory_exists(config.get_data_dir())) {LOG(ERR) << "Typesense failed to start. " << "Data directory " << config.get_data_dir()@@ -98,11 +106,12 @@ int run_server(Config & config, void (*master_server_routes)(), void (*replica_scurl_global_init(CURL_GLOBAL_SSL);server = new HttpServer(- config.get_listen_address(),- config.get_listen_port(),- config.get_ssl_cert(),- config.get_ssl_cert_key(),- config.get_enable_cors()+ version,+ config.get_listen_address(),+ config.get_listen_port(),+ config.get_ssl_cert(),+ config.get_ssl_cert_key(),+ config.get_enable_cors());server->set_auth_handler(handle_authentication);@@ -131,7 +140,7 @@ int run_server(Config & config, void (*master_server_routes)(), void (*replica_sreplication_thread.detach();}- int ret_code = server->run();+ ret_code = server->run();curl_global_cleanup();