From 51d9e2c21e62d044d8280d43658820761d3c0654 Mon Sep 17 00:00:00 2001 From: jinhai Date: Wed, 8 May 2019 14:55:21 +0800 Subject: [PATCH] Add license check functions Former-commit-id: d3120c7b805a59bcb736908990d68652008eca8d --- cpp/src/CMakeLists.txt | 10 ++++++++++ cpp/src/license/License.cpp | 14 ++++++++++++++ cpp/src/license/License.h | 16 ++++++++++++++++ cpp/src/license/LicenseGenerator.cpp | 6 ++++++ cpp/src/server/Server.cpp | 8 +++++++- 5 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 cpp/src/license/License.cpp create mode 100644 cpp/src/license/License.h create mode 100644 cpp/src/license/LicenseGenerator.cpp diff --git a/cpp/src/CMakeLists.txt b/cpp/src/CMakeLists.txt index 7087d59cc3..a073f096c2 100644 --- a/cpp/src/CMakeLists.txt +++ b/cpp/src/CMakeLists.txt @@ -11,6 +11,10 @@ aux_source_directory(utils utils_files) aux_source_directory(db db_files) aux_source_directory(wrapper wrapper_files) +set(license_check_files + ${CMAKE_CURRENT_SOURCE_DIR}/license/License.cpp + ) + set(service_files thrift/gen-cpp/VecService.cpp thrift/gen-cpp/VectorService_constants.cpp @@ -49,6 +53,7 @@ add_executable(vecwise_server ${server_files} ${utils_files} ${service_files} + ${license_check_files} ${VECWISE_THIRD_PARTY_BUILD}/include/easylogging++.cc ) @@ -69,3 +74,8 @@ set(server_libs ) target_link_libraries(vecwise_server ${server_libs}) + +set(license_generator_src + ${CMAKE_CURRENT_SOURCE_DIR}/license/LicenseGenerator.cpp) + +add_executable(license_generator ${license_generator_src}) diff --git a/cpp/src/license/License.cpp b/cpp/src/license/License.cpp new file mode 100644 index 0000000000..cad684bc10 --- /dev/null +++ b/cpp/src/license/License.cpp @@ -0,0 +1,14 @@ +#include "License.h" + +namespace zilliz { +namespace vecwise { +namespace server { + +ServerError +LicenseValidate(const std::string& path) { + return SERVER_SUCCESS; +} + +} +} +} \ No newline at end of file diff --git a/cpp/src/license/License.h b/cpp/src/license/License.h new file mode 100644 index 0000000000..cf4888b07b --- /dev/null +++ b/cpp/src/license/License.h @@ -0,0 +1,16 @@ +#pragma once + +#include "utils/Error.h" + +namespace zilliz { +namespace vecwise { +namespace server { + +ServerError +LicenseValidate(const std::string& path); + +} +} +} + + diff --git a/cpp/src/license/LicenseGenerator.cpp b/cpp/src/license/LicenseGenerator.cpp new file mode 100644 index 0000000000..f82e948c30 --- /dev/null +++ b/cpp/src/license/LicenseGenerator.cpp @@ -0,0 +1,6 @@ +#include + +int main() { + std::cout << "This is license generator" << std::endl; + return 0; +} \ No newline at end of file diff --git a/cpp/src/server/Server.cpp b/cpp/src/server/Server.cpp index 82e1fec698..930c29fac9 100644 --- a/cpp/src/server/Server.cpp +++ b/cpp/src/server/Server.cpp @@ -9,7 +9,7 @@ #include "utils/Log.h" #include "utils/SignalUtil.h" #include "utils/TimeRecorder.h" - +#include "license/License.h" #include #include @@ -133,6 +133,12 @@ Server::Daemonize() { int Server::Start() { + std::string license_file_path = "/tmp/vecwise.license"; + if(LicenseValidate(license_file_path) != SERVER_SUCCESS) { + SERVER_LOG_ERROR << "License check failed"; + return 1; + } + if (daemonized_) { Daemonize(); }