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
Upgrade glog to avail static log file name feature.
kishorenc57a43a0b210c
diff --git a/.circleci/config.yml b/.circleci/config.ymlindex 765bc4ae..a55fe2d4 100644--- a/.circleci/config.yml+++ b/.circleci/config.yml@@ -2,7 +2,7 @@ version: 2jobs:build:docker:- - image: typesense/typesense-development:22-JUNE-2020-1+ - image: typesense/typesense-development:23-JUNE-2020-1environment:- PROJECT_DIR: /typesense- TYPESENSE_VERSION: $CIRCLE_BRANCH-$CIRCLE_SHA1diff --git a/docker-build.sh b/docker-build.shindex 94164a05..e2ab7d71 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:22-JUNE-2020-1 $PROJECT_DIR/docker+#docker build --file $PROJECT_DIR/docker/development.Dockerfile --tag typesense/typesense-development:23-JUNE-2020-1 $PROJECT_DIR/dockerecho "Building Typesense $TYPESENSE_VERSION..."-docker run -it -v $PROJECT_DIR:/typesense typesense/typesense-development:22-JUNE-2020-1 cmake -DTYPESENSE_VERSION=$TYPESENSE_VERSION \+docker run -it -v $PROJECT_DIR:/typesense typesense/typesense-development:23-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:22-JUNE-2020-1 make typesense-server -C/typesense/$BUILD_DIR+docker run -it -v $PROJECT_DIR:/typesense typesense/typesense-development:23-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:22-JUNE-2020-1 cmake -DTYPESENSE_VERSION=$TYPESENSE_VERSION \+# docker run -it -v $PROJECT_DIR:/typesense typesense/typesense-development:23-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 8b6d0cc4..ad2acb33 100644--- a/docker/development.Dockerfile+++ b/docker/development.Dockerfile@@ -60,9 +60,10 @@ 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 && \+ADD https://github.com/google/glog/archive/0a2e593.tar.gz /opt/glog-0a2e593.tar.gz+RUN tar -C /opt -xf /opt/glog-0a2e593.tar.gz+RUN mkdir -p /opt/glog-0a2e5931bd5ff22fd3bf8999eb8ce776f159cda6/bld && \+ cd /opt/glog-0a2e5931bd5ff22fd3bf8999eb8ce776f159cda6/bld && \cmake -DBUILD_TESTING=0 -DWITH_GFLAGS=ON -DWITH_UNWIND=OFF .. && \cmake --build . && make install && rm -rf /usr/local/lib/*.so*@@ -70,18 +71,18 @@ ADD https://github.com/apache/incubator-brpc/archive/0.9.7-rc03.tar.gz /opt/brpcRUN 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.txt-RUN mkdir -p /opt/incubator-brpc-0.9.7-rc03/build && cd /opt/incubator-brpc-0.9.7-rc03/build && \+RUN mkdir -p /opt/incubator-brpc-0.9.7-rc03/bld && cd /opt/incubator-brpc-0.9.7-rc03/bld && \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+ rm -rf /opt/incubator-brpc-0.9.7-rc03/bld/output/binADD https://github.com/baidu/braft/archive/v1.1.1.tar.gz /opt/braft-v1.1.1.tar.gzRUN tar -C /opt -xf /opt/braft-v1.1.1.tar.gzCOPY patches/braft_cmakelists.txt /opt/braft-1.1.1/src/CMakeLists.txtRUN 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 && \+RUN mkdir -p /opt/braft-1.1.1/bld && cd /opt/braft-1.1.1/bld && \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/bin+ rm -rf /opt/braft-1.1.1/bld/output/binENV CC /usr/local/gcc-6.4.0/bin/gccENV CXX /usr/local/gcc-6.4.0/bin/g++diff --git a/src/typesense_server_utils.cpp b/src/typesense_server_utils.cppindex 938e2a45..15fb9d67 100644--- a/src/typesense_server_utils.cpp+++ b/src/typesense_server_utils.cpp@@ -150,12 +150,17 @@ int init_logger(Config & config, const std::string & server_version) {return 1;}- 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());-// flush log levels above -1 immediately (INFO=0)FLAGS_logbuflevel = -1;++ // available only on glog master (ensures that log file name is constant)+ FLAGS_timestamp_in_logfile_name = false;++ std::string log_path = log_dir + "/" + "typesense.log";+ google::SetLogDestination(google::INFO, log_path.c_str());+ google::SetLogSymlink(google::INFO, "");++ std::cout << "Log directory is configured as: " << log_dir << std::endl;}return 0;