This is an automated email from the ASF dual-hosted git repository. gosonzhang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-tubemq.git
commit 3249de37acf054a9c43677131cfbb09fc6d366d1 Author: gosonzhang <[email protected]> AuthorDate: Thu Apr 8 17:46:29 2021 +0800 [TUBEMQ-594] Trpc-go tube sdk strongly rely on local config(addendum) --- .../include/tubemq/tubemq_config.h | 21 +++++++------ .../tubemq-client-cpp/src/client_service.cc | 18 ++++++------ .../tubemq-client-cpp/src/tubemq_config.cc | 34 +++++++--------------- 3 files changed, 29 insertions(+), 44 deletions(-) diff --git a/tubemq-client-twins/tubemq-client-cpp/include/tubemq/tubemq_config.h b/tubemq-client-twins/tubemq-client-cpp/include/tubemq/tubemq_config.h index 69f6434..3ba9182 100644 --- a/tubemq-client-twins/tubemq-client-cpp/include/tubemq/tubemq_config.h +++ b/tubemq-client-twins/tubemq-client-cpp/include/tubemq/tubemq_config.h @@ -39,20 +39,19 @@ class TubeMQServiceConfig { public: TubeMQServiceConfig(); ~TubeMQServiceConfig(); - TubeMQServiceConfig& operator=(const TubeMQServiceConfig& target); - void setLogCofigInfo(int32_t log_max_num, + void SetLogCofigInfo(int32_t log_max_num, int32_t log_max_size, int32_t log_level, const string& log_path); - const int32_t getMaxLogFileNum() const; - const int32_t getMaxLogFileSize() const; - const int32_t getLogPrintLevel() const; + const int32_t GetMaxLogFileNum() const; + const int32_t GetMaxLogFileSize() const; + const int32_t GetLogPrintLevel() const; const string& GetLogStorePath() const; - void setDnsXfsPeriodInMs(int32_t dns_xfs_period_ms); - const int32_t getDnsXfsPeriodInMs() const; - void setServiceThreads(int32_t timer_threads, + void SetDnsXfsPeriodInMs(int32_t dns_xfs_period_ms); + const int32_t GetDnsXfsPeriodInMs() const; + void SetServiceThreads(int32_t timer_threads, int32_t network_threads, int32_t signal_threads); - const int32_t getTimerThreads() const; - const int32_t getNetWorkThreads() const; - const int32_t getSignalThreads() const; + const int32_t GetTimerThreads() const; + const int32_t GetNetWorkThreads() const; + const int32_t GetSignalThreads() const; const string ToString() const; private: diff --git a/tubemq-client-twins/tubemq-client-cpp/src/client_service.cc b/tubemq-client-twins/tubemq-client-cpp/src/client_service.cc index 4778673..549bc0a 100644 --- a/tubemq-client-twins/tubemq-client-cpp/src/client_service.cc +++ b/tubemq-client-twins/tubemq-client-cpp/src/client_service.cc @@ -120,15 +120,15 @@ bool TubeMQService::IsRunning() { return (service_status_.Get() == 2); } void TubeMQService::iniServiceConfigure() { // initial logger parameters GetLogger().Init(serviceConfig_.GetLogStorePath(), - Logger::Level(serviceConfig_.getLogPrintLevel()), - serviceConfig_.getMaxLogFileSize(), serviceConfig_.getMaxLogFileNum()); + Logger::Level(serviceConfig_.GetLogPrintLevel()), + serviceConfig_.GetMaxLogFileSize(), serviceConfig_.GetMaxLogFileNum()); // initial dns translate thread dns_xfs_thread_ = std::thread(&TubeMQService::thread_task_dnsxfs, - this, serviceConfig_.getDnsXfsPeriodInMs()); + this, serviceConfig_.GetDnsXfsPeriodInMs()); // initial service thread pools - timer_executor_->Resize(serviceConfig_.getTimerThreads()); - network_executor_->Resize(serviceConfig_.getNetWorkThreads()); - thread_pool_ = std::make_shared<ThreadPool>(serviceConfig_.getSignalThreads()); + timer_executor_->Resize(serviceConfig_.GetTimerThreads()); + network_executor_->Resize(serviceConfig_.GetNetWorkThreads()); + thread_pool_ = std::make_shared<ThreadPool>(serviceConfig_.GetSignalThreads()); connection_pool_ = std::make_shared<ConnectionPool>(network_executor_); } @@ -290,11 +290,11 @@ bool TubeMQService::getServiceConfByFile(string& err_info, fileini.GetValue(err_info, sector, "log_path", log_path, "../log/tubemq"); fileini.GetValue(err_info, sector, "log_level", log_level, 4); log_level = TUBEMQ_MID(log_level, 4, 0); - serviceConfig.setLogCofigInfo(log_num, log_size, log_level, log_path); + serviceConfig.SetLogCofigInfo(log_num, log_size, log_level, log_path); // get dns translate period int32_t dns_xfs_period_ms = 30 * 1000; fileini.GetValue(err_info, sector, "dns_xfs_period_ms", dns_xfs_period_ms, 30 * 1000); - serviceConfig.setDnsXfsPeriodInMs(dns_xfs_period_ms); + serviceConfig.SetDnsXfsPeriodInMs(dns_xfs_period_ms); // get thread pools paremeters int32_t timer_threads = 2; int32_t network_threads = 4; @@ -302,7 +302,7 @@ bool TubeMQService::getServiceConfByFile(string& err_info, fileini.GetValue(err_info, sector, "timer_threads", timer_threads, 2); fileini.GetValue(err_info, sector, "network_threads", network_threads, 4); fileini.GetValue(err_info, sector, "signal_threads", signal_threads, 8); - serviceConfig.setServiceThreads(timer_threads, network_threads, signal_threads); + serviceConfig.SetServiceThreads(timer_threads, network_threads, signal_threads); err_info = "Ok"; return true; } diff --git a/tubemq-client-twins/tubemq-client-cpp/src/tubemq_config.cc b/tubemq-client-twins/tubemq-client-cpp/src/tubemq_config.cc index 809dd09..537dc94 100644 --- a/tubemq-client-twins/tubemq-client-cpp/src/tubemq_config.cc +++ b/tubemq-client-twins/tubemq-client-cpp/src/tubemq_config.cc @@ -49,21 +49,7 @@ TubeMQServiceConfig::~TubeMQServiceConfig() { // } -TubeMQServiceConfig& TubeMQServiceConfig::operator=(const TubeMQServiceConfig& target) { - if (this != &target) { - log_num_ = target.log_num_; - log_size_ = target.log_size_; - log_level_ = target.log_level_; - log_path_ = target.log_path_; - dns_xfs_period_ms_ = target.dns_xfs_period_ms_; - timer_threads_ = target.timer_threads_; - network_threads_ = target.network_threads_; - signal_threads_ = target.signal_threads_; - } - return *this; -} - -void TubeMQServiceConfig::setLogCofigInfo(int32_t log_max_num, +void TubeMQServiceConfig::SetLogCofigInfo(int32_t log_max_num, int32_t log_max_size, int32_t log_level, const string& log_path) { log_num_ = log_max_num; log_size_ = log_max_size; @@ -72,27 +58,27 @@ void TubeMQServiceConfig::setLogCofigInfo(int32_t log_max_num, log_level_ = TUBEMQ_MID(log_level, 4, 0); } -void TubeMQServiceConfig::setDnsXfsPeriodInMs(int32_t dns_xfs_period_ms) { +void TubeMQServiceConfig::SetDnsXfsPeriodInMs(int32_t dns_xfs_period_ms) { dns_xfs_period_ms_ = TUBEMQ_MID(dns_xfs_period_ms, tb_config::kMaxIntValue, 10000); } -void TubeMQServiceConfig::setServiceThreads(int32_t timer_threads, +void TubeMQServiceConfig::SetServiceThreads(int32_t timer_threads, int32_t network_threads, int32_t signal_threads) { timer_threads_ = TUBEMQ_MID(timer_threads, 50, 2); network_threads_ = TUBEMQ_MID(network_threads, 50, 4); signal_threads_ = TUBEMQ_MID(signal_threads, 50, 4); } -const int32_t TubeMQServiceConfig::getMaxLogFileNum() const { +const int32_t TubeMQServiceConfig::GetMaxLogFileNum() const { return log_num_; } -const int32_t TubeMQServiceConfig::getMaxLogFileSize() const { +const int32_t TubeMQServiceConfig::GetMaxLogFileSize() const { return log_size_; } -const int32_t TubeMQServiceConfig::getLogPrintLevel() const { +const int32_t TubeMQServiceConfig::GetLogPrintLevel() const { return log_level_; } @@ -100,19 +86,19 @@ const string& TubeMQServiceConfig::GetLogStorePath() const { return log_path_; } -const int32_t TubeMQServiceConfig::getDnsXfsPeriodInMs() const { +const int32_t TubeMQServiceConfig::GetDnsXfsPeriodInMs() const { return dns_xfs_period_ms_; } -const int32_t TubeMQServiceConfig::getTimerThreads() const { +const int32_t TubeMQServiceConfig::GetTimerThreads() const { return timer_threads_; } -const int32_t TubeMQServiceConfig::getNetWorkThreads() const { +const int32_t TubeMQServiceConfig::GetNetWorkThreads() const { return network_threads_; } -const int32_t TubeMQServiceConfig::getSignalThreads() const { +const int32_t TubeMQServiceConfig::GetSignalThreads() const { return signal_threads_; }
