Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions include/polaris/plugin.h
Original file line number Diff line number Diff line change
Expand Up @@ -351,8 +351,8 @@ class LoadBalancer : public Plugin {

/// @brief
struct InstanceGauge {
InstanceGauge() : call_ret_status(kCallRetOk), call_ret_code(0), call_daley(0),
locality_aware_info(0) {}
InstanceGauge()
: call_ret_status(kCallRetOk), call_ret_code(0), call_daley(0), locality_aware_info(0) {}
std::string service_name;
std::string service_namespace;
std::string instance_id;
Expand Down
6 changes: 3 additions & 3 deletions polaris/engine/engine.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class Context;
Engine::Engine(Context* context)
: context_(context), main_executor_(context), cache_manager_(context),
monitor_reporter_(context_), circuit_breaker_executor_(context),
health_check_executor_(context) {}
health_checker_executor_(context) {}

Engine::~Engine() {
StopAndWait();
Expand All @@ -38,7 +38,7 @@ ReturnCode Engine::Start() {
(ret_code = cache_manager_.Start()) != kReturnOk ||
(ret_code = monitor_reporter_.Start()) != kReturnOk ||
(ret_code = circuit_breaker_executor_.Start()) != kReturnOk ||
(ret_code = health_check_executor_.Start()) != kReturnOk) {
(ret_code = health_checker_executor_.Start()) != kReturnOk) {
return ret_code;
}
return kReturnOk;
Expand All @@ -49,7 +49,7 @@ ReturnCode Engine::StopAndWait() {
cache_manager_.StopAndWait();
monitor_reporter_.StopAndWait();
circuit_breaker_executor_.StopAndWait();
health_check_executor_.StopAndWait();
health_checker_executor_.StopAndWait();
return kReturnOk;
}

Expand Down
2 changes: 1 addition & 1 deletion polaris/engine/engine.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class Engine {
CacheManager cache_manager_;
MonitorReporter monitor_reporter_;
CircuitBreakerExecutor circuit_breaker_executor_;
HealthCheckExecutor health_check_executor_;
HealthCheckExecutor health_checker_executor_;
};

} // namespace polaris
Expand Down
2 changes: 1 addition & 1 deletion polaris/engine/health_check_executor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ void HealthCheckExecutor::TimingDetect(HealthCheckExecutor* executor) {
std::vector<ServiceContext*> all_service_contexts;
executor->context_->GetContextImpl()->GetAllServiceContext(all_service_contexts);
for (std::size_t i = 0; i < all_service_contexts.size(); ++i) {
CircuitBreakerChain* circuit_breaker_chain = all_service_contexts[i]->GetCircuitBreakerChain();
HealthCheckerChain* health_checker_chain = all_service_contexts[i]->GetHealthCheckerChain();
CircuitBreakerChain* circuit_breaker_chain = all_service_contexts[i]->GetCircuitBreakerChain();
health_checker_chain->DetectInstance(*circuit_breaker_chain);
all_service_contexts[i]->DecrementRef();
}
Expand Down
2 changes: 1 addition & 1 deletion polaris/plugin/local_registry/local_registry.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ ReturnCode InMemoryRegistry::GetCircuitBreakerInstances(const ServiceKey& servic
const std::string& instance_id = *it;
std::map<std::string, Instance*>::iterator iter = instance_map.find(instance_id);
if (iter == instance_map.end()) {
POLARIS_LOG(LOG_INFO, "The outlier detector of service[%s/%s] getting instance[%s] failed",
POLARIS_LOG(LOG_INFO, "The health checker of service[%s/%s] getting instance[%s] failed",
service_key.namespace_.c_str(), service_key.name_.c_str(), instance_id.c_str());
continue;
}
Expand Down
1 change: 1 addition & 0 deletions test/logger_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ TEST_F(LoggerTest, TestFileShift) {

const char *text = "test logger file shift";
logger->Log(LOG_INFO, "%s\n", text);

ASSERT_TRUE(FileUtils::FileExists(log_path_ + "/" + log_file_name_));
ASSERT_TRUE(logger->log_file_ != NULL);
ASSERT_TRUE(logger->cur_file_size_ > 0);
Expand Down