Merge commit 'bc883a4' into sync_up_main

eBay · Jul 18, 2024 · a5cf090 · a5cf090
2 parents 482ece3 + bc883a4
commit a5cf090
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/.clang-format b/.clang-format
@@ -17,7 +17,6 @@ AlignEscapedNewlines: Right
 AlignOperands:   false
 AlignTrailingComments: true
 AllowShortIfStatementsOnASingleLine: true
-AllowShortBlocksOnASingleLine: true
 AllowShortCaseLabelsOnASingleLine: false
 # AllowShortFunctionsOnASingleLine: InlineOnly
 # AllowShortLoopsOnASingleLine: false

diff --git a/conanfile.py b/conanfile.py
@@ -10,7 +10,7 @@
 
 class NuRaftMesgConan(ConanFile):
     name = "nuraft_mesg"
-    version = "3.5.2"
+    version = "3.5.3"
 
     homepage = "https://github.com/eBay/nuraft_mesg"
     description = "A gRPC service for NuRAFT"

diff --git a/src/lib/manager_impl.cpp b/src/lib/manager_impl.cpp
@@ -95,7 +95,7 @@ void ManagerImpl::restart_server() {
     RELEASE_ASSERT(_mesg_service, "Need to call ::start() first!");
     sisl::GrpcServer* tmp_server = nullptr;
     try {
-        tmp_server = sisl::GrpcServer::make(listen_address, _start_params.token_verifier_,
+        tmp_server = sisl::GrpcServer::make(listen_address, start_params_.token_verifier_,
                                             NURAFT_MESG_CONFIG(grpc_server_thread_cnt), start_params_.ssl_key_,
                                             start_params_.ssl_cert_, start_params_.max_message_size_);
     } catch (std::runtime_error const& e) {