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
Move to glog.
kishorence314ec23e6c6
diff --git a/.circleci/config.yml b/.circleci/config.ymlindex 63d2d996..8609ef77 100644--- a/.circleci/config.yml+++ b/.circleci/config.yml@@ -2,7 +2,7 @@ version: 2jobs:build:docker:- - image: typesense/typesense-development:22-MAR-2020-5+ - image: typesense/typesense-development:22-JUNE-2020-1environment:- PROJECT_DIR: /typesense- TYPESENSE_VERSION: $CIRCLE_BRANCH-$CIRCLE_SHA1diff --git a/CMakeLists.txt b/CMakeLists.txtindex b8c4e9f8..358f2502 100644--- a/CMakeLists.txt+++ b/CMakeLists.txt@@ -43,6 +43,7 @@ FIND_PACKAGE(ICU REQUIRED)FIND_PACKAGE(Protobuf REQUIRED)FIND_PACKAGE(LevelDB REQUIRED)FIND_PACKAGE(gflags REQUIRED)+FIND_PACKAGE(glog REQUIRED)message("OpenSSL library: ${OPENSSL_LIBRARIES}")@@ -152,7 +153,7 @@ set(ICU_ALL_LIBRARIES ${ICU_I18N_LIBRARIES} ${ICU_LIBRARIES} ${ICU_DATA_LIBRARIEset(CORE_LIBS h2o-evloop iconv ${CURL_LIBRARIES} for ${ICU_ALL_LIBRARIES} ${G3LOGGER_LIBRARIES}${ROCKSDB_LIBS} ${OPENSSL_LIBRARIES} pthread dl ${STD_LIB})-set(CORE_LIBS braft brpc ${LevelDB_LIBRARIES} ${CORE_LIBS} ${GFLAGS_LIBRARIES} ${PROTOBUF_LIBRARIES} ${SYSTEM_LIBS})+set(CORE_LIBS braft brpc ${LevelDB_LIBRARIES} ${GLOG_LIBRARIES} ${CORE_LIBS} ${GFLAGS_LIBRARIES} ${PROTOBUF_LIBRARIES} ${SYSTEM_LIBS})target_link_libraries(typesense-core ${CORE_LIBS})target_link_libraries(typesense-server ${CORE_LIBS})diff --git a/cmake/Modules/FindGlog.cmake b/cmake/Modules/FindGlog.cmakenew file mode 100644index 00000000..688e30ce--- /dev/null+++ b/cmake/Modules/FindGlog.cmake@@ -0,0 +1,40 @@+# - Try to find Glog+#+# The following variables are optionally searched for defaults+# GLOG_ROOT_DIR: Base directory where all GLOG components are found+#+# The following are set after configuration is done:+# GLOG_FOUND+# GLOG_INCLUDE_DIRS+# GLOG_LIBRARIES++include(FindPackageHandleStandardArgs)++if (NOT DEFINED GLOG_ROOT)+ message("set GLOG_ROOT========================")+ set (GLOG_ROOT /usr /usr/local /usr/include/)+endif (NOT DEFINED GLOG_ROOT)++#set(GLOG_ROOT_DIR "" CACHE PATH "Folder contains Google glog")++find_path(GLOG_INCLUDE_DIR glog/logging.h+ PATHS+ ${GLOG_ROOT_DIR}+ PATH_SUFFIXES+ src)++find_library(GLOG_LIBRARY glog libglog+ PATHS+ ${GLOG_ROOT_DIR}+ PATH_SUFFIXES+ .libs+ lib+ lib64)++find_package_handle_standard_args(GLOG DEFAULT_MSG+ GLOG_INCLUDE_DIR GLOG_LIBRARY)++if(GLOG_FOUND)+ set(GLOG_INCLUDE_DIRS ${GLOG_INCLUDE_DIR})+ set(GLOG_LIBRARIES ${GLOG_LIBRARY})+endif()\ No newline at end of filediff --git a/cmake/braft.cmake b/cmake/braft.cmakeindex 082f95c9..b72a1e25 100644--- a/cmake/braft.cmake+++ b/cmake/braft.cmake@@ -1,4 +1,4 @@-set(BRAFT_VERSION 0a9ec3f)+set(BRAFT_VERSION fb27e63)set(BRAFT_NAME braft-${BRAFT_VERSION})set(BRAFT_TAR_PATH ${DEP_ROOT_DIR}/${BRAFT_NAME}.tar.gz)diff --git a/cmake/brpc.cmake b/cmake/brpc.cmakeindex 4c97adf1..9ea1927a 100644--- a/cmake/brpc.cmake+++ b/cmake/brpc.cmake@@ -1,4 +1,4 @@-set(BRPC_VERSION 23c66e3)+set(BRPC_VERSION 2f8fc37d)set(BRPC_NAME brpc-${BRPC_VERSION})set(BRPC_TAR_PATH ${DEP_ROOT_DIR}/${BRPC_NAME}.tar.gz)diff --git a/docker-build.sh b/docker-build.shindex 16bd3f26..94164a05 100755--- a/docker-build.sh+++ b/docker-build.sh@@ -22,13 +22,13 @@ if [[ "$@" == *"--depclean"* ]]; thenfi#echo "Creating development image..."-#docker build --file $PROJECT_DIR/docker/development.Dockerfile --tag typesense/typesense-development:latest $PROJECT_DIR/docker+#docker build --file $PROJECT_DIR/docker/development.Dockerfile --tag typesense/typesense-development:22-JUNE-2020-1 $PROJECT_DIR/dockerecho "Building Typesense $TYPESENSE_VERSION..."-docker run -it -v $PROJECT_DIR:/typesense typesense/typesense-development cmake -DTYPESENSE_VERSION=$TYPESENSE_VERSION \+docker run -it -v $PROJECT_DIR:/typesense typesense/typesense-development:22-JUNE-2020-1 cmake -DTYPESENSE_VERSION=$TYPESENSE_VERSION \-DCMAKE_BUILD_TYPE=Release -H/typesense -B/typesense/$BUILD_DIR-docker run -it -v $PROJECT_DIR:/typesense typesense/typesense-development make typesense-server -C/typesense/$BUILD_DIR+docker run -it -v $PROJECT_DIR:/typesense typesense/typesense-development:22-JUNE-2020-1 make typesense-server -C/typesense/$BUILD_DIRif [[ "$@" == *"--build-deploy-image"* ]]; thenecho "Creating deployment image for Typesense $TYPESENSE_VERSION server ..."@@ -60,7 +60,7 @@ if [[ "$@" == *"--package-libs"* ]]; thenfi##if [[ "$@" == *"--create-deb-upload"* ]]; then-# docker run -it -v $PROJECT_DIR:/typesense typesense/typesense-development cmake -DTYPESENSE_VERSION=$TYPESENSE_VERSION \+# docker run -it -v $PROJECT_DIR:/typesense typesense/typesense-development:22-JUNE-2020-1 cmake -DTYPESENSE_VERSION=$TYPESENSE_VERSION \# -DCMAKE_BUILD_TYPE=Debug -H/typesense -B/typesense/$BUILD_DIR#fidiff --git a/docker/development.Dockerfile b/docker/development.Dockerfileindex 790a3246..8b6d0cc4 100644--- a/docker/development.Dockerfile+++ b/docker/development.Dockerfile@@ -55,25 +55,33 @@ ADD https://github.com/protocolbuffers/protobuf/releases/download/v3.11.4/protobRUN tar -C /opt -xf /opt/protobuf-cpp-3.11.4.tar.gz && chown -R root:root /opt/protobuf-3.11.4RUN cd /opt/protobuf-3.11.4 && ./configure --disable-shared && make -j8 && make check && make install && rm -rf /usr/local/lib/*.so*-ADD https://github.com/google/leveldb/archive/1.22.tar.gz /opt/leveldb-1.22.tar.gz.tar.gz-RUN tar -C /opt -xf /opt/leveldb-1.22.tar.gz.tar.gz+ADD https://github.com/google/leveldb/archive/1.22.tar.gz /opt/leveldb-1.22.tar.gz+RUN tar -C /opt -xf /opt/leveldb-1.22.tar.gzRUN mkdir -p /opt/leveldb-1.22/build && cd /opt/leveldb-1.22/build && cmake -DCMAKE_BUILD_TYPE=Release .. && \cmake --build . && make install && rm -rf /usr/local/lib/*.so*+ADD https://github.com/google/glog/archive/v0.4.0.tar.gz /opt/glog-0.4.0.tar.gz+RUN tar -C /opt -xf /opt/glog-0.4.0.tar.gz+RUN mkdir -p /opt/glog-0.4.0/build && cd /opt/glog-0.4.0/build && \+ cmake -DBUILD_TESTING=0 -DWITH_GFLAGS=ON -DWITH_UNWIND=OFF .. && \+ cmake --build . && make install && rm -rf /usr/local/lib/*.so*+ADD https://github.com/apache/incubator-brpc/archive/0.9.7-rc03.tar.gz /opt/brpc-0.9.7-rc03.tar.gzRUN tar -C /opt -xf /opt/brpc-0.9.7-rc03.tar.gzCOPY patches/brpc_cmakelists.txt /opt/incubator-brpc-0.9.7-rc03/src/CMakeLists.txtRUN chown root:root /opt/incubator-brpc-0.9.7-rc03/src/CMakeLists.txtRUN mkdir -p /opt/incubator-brpc-0.9.7-rc03/build && cd /opt/incubator-brpc-0.9.7-rc03/build && \- cmake -DWITH_DEBUG_SYMBOLS=OFF .. && make -j8 && make install && rm -rf /usr/local/lib/*.so* && \+ cmake -DWITH_DEBUG_SYMBOLS=OFF -DWITH_GLOG=ON .. && \+ make -j8 && make install && rm -rf /usr/local/lib/*.so* && \rm -rf /opt/incubator-brpc-0.9.7-rc03/build/output/bin-ADD https://github.com/baidu/braft/archive/v1.1.0.tar.gz /opt/braft-v1.1.0.tar.gz-RUN tar -C /opt -xf /opt/braft-v1.1.0.tar.gz-COPY patches/braft_cmakelists.txt /opt/braft-1.1.0/src/CMakeLists.txt-RUN chown root:root /opt/braft-1.1.0/src/CMakeLists.txt-RUN mkdir -p /opt/braft-1.1.0/build && cd /opt/braft-1.1.0/build && \- cmake -DWITH_DEBUG_SYMBOLS=ON .. && make -j8 && make install && rm -rf /usr/local/lib/*.so*+ADD https://github.com/baidu/braft/archive/v1.1.1.tar.gz /opt/braft-v1.1.1.tar.gz+RUN tar -C /opt -xf /opt/braft-v1.1.1.tar.gz+COPY patches/braft_cmakelists.txt /opt/braft-1.1.1/src/CMakeLists.txt+RUN chown root:root /opt/braft-1.1.1/src/CMakeLists.txt+RUN mkdir -p /opt/braft-1.1.1/build && cd /opt/braft-1.1.1/build && \+ cmake -DWITH_DEBUG_SYMBOLS=ON -DBRPC_WITH_GLOG=ON .. && make -j8 && make install && rm -rf /usr/local/lib/*.so* && \+ rm -rf /opt/braft-1.1.1/build/output/binENV CC /usr/local/gcc-6.4.0/bin/gccENV CXX /usr/local/gcc-6.4.0/bin/g++diff --git a/docker/patches/brpc_cmakelists.txt b/docker/patches/brpc_cmakelists.txtindex 03c05a11..687b3b7d 100644--- a/docker/patches/brpc_cmakelists.txt+++ b/docker/patches/brpc_cmakelists.txt@@ -35,8 +35,8 @@ add_library(brpc-static STATIC $<TARGET_OBJECTS:BUTIL_LIB>$<TARGET_OBJECTS:SOURCES_LIB>$<TARGET_OBJECTS:PROTO_LIB>)-if(BRPC_WITH_THRIFT)- target_link_libraries(brpc-static thrift)+if(BRPC_WITH_GLOG)+ target_link_libraries(brpc-static ${GLOG_LIB})endif()SET_TARGET_PROPERTIES(brpc-static PROPERTIES OUTPUT_NAME brpc CLEAN_DIRECT_OUTPUT 1)diff --git a/include/logger.h b/include/logger.hindex c8a9e62e..01adc553 100644--- a/include/logger.h+++ b/include/logger.h@@ -2,4 +2,4 @@#include <string>#include <iostream>-#include <butil/logging.h>+#include <glog/logging.h>\ No newline at end of filediff --git a/src/main/typesense_server.cpp b/src/main/typesense_server.cppindex b76942e3..5a3ef7d5 100644--- a/src/main/typesense_server.cpp+++ b/src/main/typesense_server.cpp@@ -55,13 +55,7 @@ void replica_server_routes() {server->get("/health", get_health);}-namespace logging {- DECLARE_bool(log_year);-}-int main(int argc, char **argv) {- logging::FLAGS_log_year = true;-Config config;cmdline::parser options;diff --git a/src/raft_server.cpp b/src/raft_server.cppindex 70a0b472..dc1483e9 100644--- a/src/raft_server.cpp+++ b/src/raft_server.cpp@@ -297,7 +297,7 @@ int ReplicationState::on_snapshot_load(braft::SnapshotReader* reader) {return -1;}- LOG(TRACE) << "rm " << store->get_state_dir_path() << " success";+ LOG(INFO) << "rm " << store->get_state_dir_path() << " success";std::string snapshot_path = reader->get_path();snapshot_path.append(std::string("/") + db_snapshot_name);@@ -308,7 +308,7 @@ int ReplicationState::on_snapshot_load(braft::SnapshotReader* reader) {return -1;}- LOG(TRACE) << "copy snapshot " << snapshot_path << " to " << store->get_state_dir_path() << " success";+ LOG(INFO) << "copy snapshot " << snapshot_path << " to " << store->get_state_dir_path() << " success";return init_db();}diff --git a/src/typesense_server_utils.cpp b/src/typesense_server_utils.cppindex 1a940518..938e2a45 100644--- a/src/typesense_server_utils.cpp+++ b/src/typesense_server_utils.cpp@@ -133,35 +133,31 @@ int init_logger(Config & config, const std::string & server_version) {signal(SIGILL, catch_crash);signal(SIGSEGV, catch_crash);- logging::LoggingSettings log_settings;-// we can install new signal handlers only after overriding abovesignal(SIGINT, catch_interrupt);signal(SIGTERM, catch_interrupt);+ google::InitGoogleLogging("typesense");+std::string log_dir = config.get_log_dir();- std::string log_path;if(log_dir.empty()) {// use console logger if log dir is not specified- log_settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;+ FLAGS_logtostderr = true;} else {if(!directory_exists(log_dir)) {std::cerr << "Typesense failed to start. " << "Log directory " << log_dir << " does not exist.";return 1;}- log_settings.logging_dest = logging::LOG_TO_FILE;- log_path = log_dir + "/" + "typesense.log";- log_settings.log_file = log_path.c_str();+ std::cout << "Log directory is configured as: " << log_dir << std::endl;+ std::string log_path_prefix = log_dir + "/" + "typesense-log-";+ google::SetLogDestination(google::INFO, log_path_prefix.c_str());- LOG(INFO) << "Starting Typesense " << server_version << ". Log directory is configured as: "- << log_dir << std::endl;+ // flush log levels above -1 immediately (INFO=0)+ FLAGS_logbuflevel = -1;}- logging::InitLogging(log_settings);- logging::SetMinLogLevel(0);-return 0;}@@ -275,7 +271,6 @@ int start_raft_server(ReplicationState& replication_state, const std::string& st}int run_server(const Config & config, const std::string & version, void (*master_server_routes)()) {-LOG(INFO) << "Starting Typesense " << version << std::flush;quit_raft_service = false;