From 953a2e2e9695561d790a61fb969c3e91ace4bab1 Mon Sep 17 00:00:00 2001 From: Yonas Habteab Date: Tue, 20 May 2025 17:10:33 +0200 Subject: [PATCH] Merge `{host,service}::StateTypeToString()` & drop unused `StateTypeFromString()` --- lib/compat/compatlogger.cpp | 12 ++++++------ lib/db_ido/dbevents.cpp | 4 ++-- lib/icinga/checkable.cpp | 6 ++++++ lib/icinga/checkable.hpp | 2 ++ lib/icinga/host.cpp | 16 ---------------- lib/icinga/host.hpp | 3 --- lib/icinga/service.cpp | 16 ---------------- lib/icinga/service.hpp | 3 --- 8 files changed, 16 insertions(+), 46 deletions(-) diff --git a/lib/compat/compatlogger.cpp b/lib/compat/compatlogger.cpp index 95ca830e1..60b47556e 100644 --- a/lib/compat/compatlogger.cpp +++ b/lib/compat/compatlogger.cpp @@ -130,7 +130,7 @@ void CompatLogger::CheckResultHandler(const Checkable::Ptr& checkable, const Che << host->GetName() << ";" << service->GetShortName() << ";" << Service::StateToString(service->GetState()) << ";" - << Service::StateTypeToString(service->GetStateType()) << ";" + << Checkable::StateTypeToString(service->GetStateType()) << ";" << attempt_after << ";" << output << "" << ""; @@ -140,7 +140,7 @@ void CompatLogger::CheckResultHandler(const Checkable::Ptr& checkable, const Che msgbuf << "HOST ALERT: " << host->GetName() << ";" << GetHostStateString(host) << ";" - << Host::StateTypeToString(host->GetStateType()) << ";" + << Checkable::StateTypeToString(host->GetStateType()) << ";" << attempt_after << ";" << output << "" << ""; @@ -413,14 +413,14 @@ void CompatLogger::EventCommandHandler(const Checkable::Ptr& checkable) << host->GetName() << ";" << service->GetShortName() << ";" << Service::StateToString(service->GetState()) << ";" - << Service::StateTypeToString(service->GetStateType()) << ";" + << Checkable::StateTypeToString(service->GetStateType()) << ";" << current_attempt << ";" << event_command_name; } else { msgbuf << "HOST EVENT HANDLER: " << host->GetName() << ";" << GetHostStateString(host) << ";" - << Host::StateTypeToString(host->GetStateType()) << ";" + << Checkable::StateTypeToString(host->GetStateType()) << ";" << current_attempt << ";" << event_command_name; } @@ -505,7 +505,7 @@ void CompatLogger::ReopenFile(bool rotate) msgbuf << "CURRENT HOST STATE: " << host->GetName() << ";" << GetHostStateString(host) << ";" - << Host::StateTypeToString(host->GetStateType()) << ";" + << Checkable::StateTypeToString(host->GetStateType()) << ";" << host->GetCheckAttempt() << ";" << output << ""; @@ -526,7 +526,7 @@ void CompatLogger::ReopenFile(bool rotate) << host->GetName() << ";" << service->GetShortName() << ";" << Service::StateToString(service->GetState()) << ";" - << Service::StateTypeToString(service->GetStateType()) << ";" + << Checkable::StateTypeToString(service->GetStateType()) << ";" << service->GetCheckAttempt() << ";" << output << ""; diff --git a/lib/db_ido/dbevents.cpp b/lib/db_ido/dbevents.cpp index 8358824e7..cf80a0226 100644 --- a/lib/db_ido/dbevents.cpp +++ b/lib/db_ido/dbevents.cpp @@ -994,7 +994,7 @@ void DbEvents::AddCheckResultLogHistory(const Checkable::Ptr& checkable, const C << host->GetName() << ";" << service->GetShortName() << ";" << Service::StateToString(service->GetState()) << ";" - << Service::StateTypeToString(service->GetStateType()) << ";" + << Checkable::StateTypeToString(service->GetStateType()) << ";" << service->GetCheckAttempt() << ";" << output << "" << ""; @@ -1021,7 +1021,7 @@ void DbEvents::AddCheckResultLogHistory(const Checkable::Ptr& checkable, const C msgbuf << "HOST ALERT: " << host->GetName() << ";" << GetHostStateString(host) << ";" - << Host::StateTypeToString(host->GetStateType()) << ";" + << Checkable::StateTypeToString(host->GetStateType()) << ";" << host->GetCheckAttempt() << ";" << output << "" << ""; diff --git a/lib/icinga/checkable.cpp b/lib/icinga/checkable.cpp index 13fd778a3..242139bc9 100644 --- a/lib/icinga/checkable.cpp +++ b/lib/icinga/checkable.cpp @@ -322,3 +322,9 @@ void Checkable::CleanDeadlinedExecutions(const Timer * const&) } } } + +String Checkable::StateTypeToString(StateType type) +{ + return type == StateTypeSoft ? "SOFT" : "HARD"; +} + diff --git a/lib/icinga/checkable.hpp b/lib/icinga/checkable.hpp index 310923ec8..e4403dadd 100644 --- a/lib/icinga/checkable.hpp +++ b/lib/icinga/checkable.hpp @@ -106,6 +106,8 @@ public: void UpdateNextCheck(const MessageOrigin::Ptr& origin = nullptr); + static String StateTypeToString(StateType type); + bool HasBeenChecked() const; virtual bool IsStateOK(ServiceState state) const = 0; diff --git a/lib/icinga/host.cpp b/lib/icinga/host.cpp index 10cd4b445..35fb25537 100644 --- a/lib/icinga/host.cpp +++ b/lib/icinga/host.cpp @@ -227,22 +227,6 @@ String Host::StateToString(HostState state) } } -StateType Host::StateTypeFromString(const String& type) -{ - if (type == "SOFT") - return StateTypeSoft; - else - return StateTypeHard; -} - -String Host::StateTypeToString(StateType type) -{ - if (type == StateTypeSoft) - return "SOFT"; - else - return "HARD"; -} - bool Host::ResolveMacro(const String& macro, const CheckResult::Ptr&, Value *result) const { if (macro == "state") { diff --git a/lib/icinga/host.hpp b/lib/icinga/host.hpp index d0d6c1aa4..7cacd160f 100644 --- a/lib/icinga/host.hpp +++ b/lib/icinga/host.hpp @@ -45,9 +45,6 @@ public: static HostState StateFromString(const String& state); static String StateToString(HostState state); - static StateType StateTypeFromString(const String& state); - static String StateTypeToString(StateType state); - bool ResolveMacro(const String& macro, const CheckResult::Ptr& cr, Value *result) const override; void OnAllConfigLoaded() override; diff --git a/lib/icinga/service.cpp b/lib/icinga/service.cpp index a26512b77..acc6c89e1 100644 --- a/lib/icinga/service.cpp +++ b/lib/icinga/service.cpp @@ -195,22 +195,6 @@ String Service::StateToString(ServiceState state) } } -StateType Service::StateTypeFromString(const String& type) -{ - if (type == "SOFT") - return StateTypeSoft; - else - return StateTypeHard; -} - -String Service::StateTypeToString(StateType type) -{ - if (type == StateTypeSoft) - return "SOFT"; - else - return "HARD"; -} - bool Service::ResolveMacro(const String& macro, const CheckResult::Ptr& cr, Value *result) const { if (macro == "state") { diff --git a/lib/icinga/service.hpp b/lib/icinga/service.hpp index ac27c3d93..558f73c03 100644 --- a/lib/icinga/service.hpp +++ b/lib/icinga/service.hpp @@ -39,9 +39,6 @@ public: static ServiceState StateFromString(const String& state); static String StateToString(ServiceState state); - static StateType StateTypeFromString(const String& state); - static String StateTypeToString(StateType state); - static void EvaluateApplyRules(const Host::Ptr& host); void OnAllConfigLoaded() override;