Merge pull request #116 from tier4/fix/cpu_monitor/incorrect_counter

fix(system_monitor): incorrect counter increment in CPU Usage monitor…
tier4 · Sep 9, 2022 · 552d1d9 · 552d1d9
2 parents ac7b04e + 3cb36c1
commit 552d1d9
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/system/system_monitor/src/cpu_monitor/cpu_monitor_base.cpp b/system/system_monitor/src/cpu_monitor/cpu_monitor_base.cpp
@@ -275,7 +275,8 @@ int CPUMonitorBase::CpuUsageToLevel(const std::string & cpu_name, float usage)
   if (usage >= usage_warn_) {
     if (usage_warn_check_cnt_[idx] < usage_warn_count_) {
       usage_warn_check_cnt_[idx]++;
-    } else {
+    }
+    if (usage_warn_check_cnt_[idx] >= usage_warn_count_) {
       level = DiagStatus::WARN;
     }
   } else {
@@ -284,7 +285,8 @@ int CPUMonitorBase::CpuUsageToLevel(const std::string & cpu_name, float usage)
   if (usage >= usage_error_) {
     if (usage_error_check_cnt_[idx] < usage_error_count_) {
       usage_error_check_cnt_[idx]++;
-    } else {
+    }
+    if (usage_error_check_cnt_[idx] >= usage_error_count_) {
       level = DiagStatus::ERROR;
     }
   } else {