c8h4/resply
Archived
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Add gRPC compilation support.

Browse source
This commit is contained in:
Christoph Heiss 2018-03-06 08:37:44 +01:00
parent 025a56f3de
commit 27e39a3585
2 changed files with 50 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
CMakeLists.txt
View file

@ -33,10 +33,47 @@ include_directories($ENV{SPDLOG_INCLUDE_PATH})
# protobuf
find_package(Protobuf REQUIRED)
include_directories(${Protobuf_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR})
find_program(GRPC_CPP_PLUGIN grpc_cpp_plugin)
include_directories(${Protobuf_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR})
file(GLOB protos protos/*.proto)
protobuf_generate_cpp(PROTO_SRCS PROTO_HDRS ${protos})
set(PROTO_PATH "${CMAKE_SOURCE_DIR}/protos")
set(GENERATED_PROTOBUF_PATH "${CMAKE_BINARY_DIR}")
set(GRPC_LIBRARIES grpc grpc++_unsecure)
foreach(proto ${protos})
get_filename_component(proto_name ${proto} NAME_WE)
add_custom_command(
OUTPUT "${GENERATED_PROTOBUF_PATH}/${proto_name}.pb.h"
"${GENERATED_PROTOBUF_PATH}/${proto_name}.pb.cc"
"${GENERATED_PROTOBUF_PATH}/${proto_name}.grpc.pb.h"
"${GENERATED_PROTOBUF_PATH}/${proto_name}.grpc.pb.cc"
COMMAND ${Protobuf_PROTOC_EXECUTABLE}
ARGS "--proto_path=${PROTO_PATH}"
"--cpp_out=${GENERATED_PROTOBUF_PATH}"
"${proto}"
COMMAND ${Protobuf_PROTOC_EXECUTABLE}
ARGS "--proto_path=${PROTO_PATH}"
"--grpc_out=${GENERATED_PROTOBUF_PATH}"
"--plugin=protoc-gen-grpc=${GRPC_CPP_PLUGIN}"
"${proto}"
)
list(APPEND GENERATED_PROTOBUF_FILES
"${GENERATED_PROTOBUF_PATH}/${proto_name}.pb.h"
"${GENERATED_PROTOBUF_PATH}/${proto_name}.pb.cc"
)
list(APPEND GENERATED_GRPC_FILES
"${GENERATED_PROTOBUF_PATH}/${proto_name}.grpc.pb.h"
"${GENERATED_PROTOBUF_PATH}/${proto_name}.grpc.pb.cc"
)
endforeach(proto)
# Fix compilation of gRPC files
set_source_files_properties(${GENERATED_GRPC_FILES} PROPERTIES COMPILE_FLAGS -Wno-unused-parameter)
# libresply
add_library(libresply OBJECT src/libresply.cc src/resp-parser.cc)
@ -57,15 +94,15 @@ install(FILES include/resply.h DESTINATION include)
add_executable(resply-cli src/resply-cli.cc)
target_link_libraries(resply-cli resply-static)
add_executable(proto-cli src/proto-cli.cc ${PROTO_SRCS})
add_executable(proto-cli src/proto-cli.cc ${GENERATED_PROTOBUF_FILES})
target_link_libraries(proto-cli ${PROTOBUF_LIBRARIES})
add_executable(grpc-cli src/grpc-cli.cc)
add_executable(grpc-cli src/grpc-cli.cc ${GENERATED_PROTOBUF_FILES} ${GENERATED_GRPC_FILES})
target_link_libraries(grpc-cli ${PROTOBUF_LIBRARIES} ${GRPC_LIBRARIES})
# proxy
add_executable(proxy src/proxy.cc ${PROTO_SRCS})
target_link_libraries(proxy resply-static ${PROTOBUF_LIBRARIES})
add_executable(proxy src/proxy.cc ${GENERATED_PROTOBUF_FILES} ${GENERATED_GRPC_FILES})
target_link_libraries(proxy resply-static ${PROTOBUF_LIBRARIES} ${GRPC_LIBRARIES})
# tests

12
src/proxy.cc
View file

@ -147,13 +147,13 @@ static void daemonize_process()
}
class ProtobufRedisAdapter {
class ProtobufAdapter {
public:
ProtobufRedisAdapter(const std::string& redis_host, asio::io_context& io_context) :
ProtobufAdapter(const std::string& redis_host, asio::io_context& io_context) :
client_{redis_host}, socket_{io_context}, logger_{spdlog::get(LOGGER_NAME)}
{ }
~ProtobufRedisAdapter()
~ProtobufAdapter()
{
logger_->info("Connection to {} closed.", remote_address_);
}
@ -184,7 +184,7 @@ public:
command.ParseFromString(request);
std::string debug_string{command.ShortDebugString()};
logger_->debug("Received '{}' on {}", debug_string, remote_address_);
logger_->debug("Received protobuf message '{}' from {}", debug_string, remote_address_);
std::vector<std::string> resply_command;
for (const auto& arg: command.data()) {
@ -359,10 +359,10 @@ private:
logger_->info("Started listening on 0.0.0.0:{}", options_.port);
for (;;) {
auto server{std::make_shared<ProtobufRedisAdapter>(options_.remote_host, io_context)};
auto server{std::make_shared<ProtobufAdapter>(options_.remote_host, io_context)};
acceptor.accept(server->socket());
std::thread{&ProtobufRedisAdapter::start, server}.detach();
std::thread{&ProtobufAdapter::start, server}.detach();
}
}