From bb9b6d36fd6fba12f2a2f021131e71b6efae41aa Mon Sep 17 00:00:00 2001 From: Yu Kun Date: Tue, 13 Aug 2019 17:29:13 +0800 Subject: [PATCH] rename milvus_grpc_server to milvus_server Former-commit-id: 54f295751d413a3af3765ff6334d25392ed17ac8 --- cpp/scripts/start_server.sh | 2 +- cpp/src/CMakeLists.txt | 8 ++++---- cpp/start_server.sh | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cpp/scripts/start_server.sh b/cpp/scripts/start_server.sh index 72e120f2ce..312cef86d6 100755 --- a/cpp/scripts/start_server.sh +++ b/cpp/scripts/start_server.sh @@ -1,4 +1,4 @@ #!/bin/bash -../bin/milvus_grpc_server -c ../conf/server_config.yaml -l ../conf/log_config.conf +../bin/milvus_server -c ../conf/server_config.yaml -l ../conf/log_config.conf diff --git a/cpp/src/CMakeLists.txt b/cpp/src/CMakeLists.txt index b2a224f612..efde6571d1 100644 --- a/cpp/src/CMakeLists.txt +++ b/cpp/src/CMakeLists.txt @@ -211,7 +211,7 @@ if (MILVUS_WITH_THRIFT STREQUAL "ON") ${metrics_files} ) else() - add_executable(milvus_grpc_server + add_executable(milvus_server ${config_files} ${server_files} ${grpcserver_files} @@ -231,21 +231,21 @@ if (ENABLE_LICENSE STREQUAL "ON") if(MILVUS_WITH_THRIFT STREQUAL "ON") target_link_libraries(milvus_thrift_server ${server_libs} license_check ${knowhere_libs} ${third_party_libs}) else() - target_link_libraries(milvus_grpc_server ${server_libs} license_check ${knowhere_libs} ${third_party_libs}) + target_link_libraries(milvus_server ${server_libs} license_check ${knowhere_libs} ${third_party_libs}) endif() else () if(MILVUS_WITH_THRIFT STREQUAL "ON") target_link_libraries(milvus_thrift_server ${server_libs} ${knowhere_libs} ${third_party_libs}) else() - target_link_libraries(milvus_grpc_server ${server_libs} ${knowhere_libs} ${third_party_libs}) + target_link_libraries(milvus_server ${server_libs} ${knowhere_libs} ${third_party_libs}) endif() endif() if (MILVUS_WITH_THRIFT STREQUAL "ON") install(TARGETS milvus_thrift_server DESTINATION bin) else() - install(TARGETS milvus_grpc_server DESTINATION bin) + install(TARGETS milvus_server DESTINATION bin) endif() install(FILES diff --git a/cpp/start_server.sh b/cpp/start_server.sh index e215242471..50bf8b84a8 100755 --- a/cpp/start_server.sh +++ b/cpp/start_server.sh @@ -1,4 +1,4 @@ #!/bin/bash -./cmake_build/src/milvus_grpc_server -c ./conf/server_config.yaml -l ./conf/log_config.conf & +./cmake_build/src/milvus_server -c ./conf/server_config.yaml -l ./conf/log_config.conf &