tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-26 15:14:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused parameters

Browse Source
This commit is contained in:
Yonas Habteab 2025-04-25 12:14:31 +02:00
parent 2e19fce31d
commit a589b87d6c
4 changed files with 39 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/perfdata/elasticsearchwriter.cpp
View File

@ -101,13 +101,13 @@ void ElasticsearchWriter::Resume()
CheckResultHandler(checkable, cr); CheckResultHandler(checkable, cr);
}); });
m_HandleStateChanges = Checkable::OnStateChange.connect([this](const Checkable::Ptr& checkable, m_HandleStateChanges = Checkable::OnStateChange.connect([this](const Checkable::Ptr& checkable,
const CheckResult::Ptr& cr, StateType type, const MessageOrigin::Ptr&) { const CheckResult::Ptr& cr, StateType, const MessageOrigin::Ptr&) {
StateChangeHandler(checkable, cr, type); StateChangeHandler(checkable, cr);
}); });
m_HandleNotifications = Checkable::OnNotificationSentToAllUsers.connect([this](const Notification::Ptr& notification, m_HandleNotifications = Checkable::OnNotificationSentToAllUsers.connect([this](const Notification::Ptr&,
const Checkable::Ptr& checkable, const std::set<User::Ptr>& users, const NotificationType& type, const Checkable::Ptr& checkable, const std::set<User::Ptr>& users, const NotificationType& type,
const CheckResult::Ptr& cr, const String& author, const String& text, const MessageOrigin::Ptr&) { const CheckResult::Ptr& cr, const String& author, const String& text, const MessageOrigin::Ptr&) {
NotificationSentToAllUsersHandler(notification, checkable, users, type, cr, author, text); NotificationSentToAllUsersHandler(checkable, users, type, cr, author, text);
}); });
} }
@ -280,15 +280,15 @@ void ElasticsearchWriter::InternalCheckResultHandler(const Checkable::Ptr& check
Enqueue(checkable, "checkresult", fields, cr->GetExecutionEnd()); Enqueue(checkable, "checkresult", fields, cr->GetExecutionEnd());
} }
void ElasticsearchWriter::StateChangeHandler(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr, StateType type) void ElasticsearchWriter::StateChangeHandler(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr)
{ {
if (IsPaused()) if (IsPaused())
return; return;
m_WorkQueue.Enqueue([this, checkable, cr, type]() { StateChangeHandlerInternal(checkable, cr, type); }); m_WorkQueue.Enqueue([this, checkable, cr]() { StateChangeHandlerInternal(checkable, cr); });
} }
void ElasticsearchWriter::StateChangeHandlerInternal(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr, StateType type) void ElasticsearchWriter::StateChangeHandlerInternal(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr)
{ {
AssertOnWorkQueue(); AssertOnWorkQueue();
@ -323,21 +323,19 @@ void ElasticsearchWriter::StateChangeHandlerInternal(const Checkable::Ptr& check
Enqueue(checkable, "statechange", fields, cr->GetExecutionEnd()); Enqueue(checkable, "statechange", fields, cr->GetExecutionEnd());
} }
void ElasticsearchWriter::NotificationSentToAllUsersHandler(const Notification::Ptr& notification, void ElasticsearchWriter::NotificationSentToAllUsersHandler(const Checkable::Ptr& checkable, const std::set<User::Ptr>& users,
const Checkable::Ptr& checkable, const std::set<User::Ptr>& users, NotificationType type, NotificationType type, const CheckResult::Ptr& cr, const String& author, const String& text)
const CheckResult::Ptr& cr, const String& author, const String& text)
{ {
if (IsPaused()) if (IsPaused())
return; return;
m_WorkQueue.Enqueue([this, notification, checkable, users, type, cr, author, text]() { m_WorkQueue.Enqueue([this, checkable, users, type, cr, author, text]() {
NotificationSentToAllUsersHandlerInternal(notification, checkable, users, type, cr, author, text); NotificationSentToAllUsersHandlerInternal(checkable, users, type, cr, author, text);
}); });
} }
void ElasticsearchWriter::NotificationSentToAllUsersHandlerInternal(const Notification::Ptr& notification, void ElasticsearchWriter::NotificationSentToAllUsersHandlerInternal(const Checkable::Ptr& checkable, const std::set<User::Ptr>& users,
const Checkable::Ptr& checkable, const std::set<User::Ptr>& users, NotificationType type, NotificationType type, const CheckResult::Ptr& cr, const String& author, const String& text)
const CheckResult::Ptr& cr, const String& author, const String& text)
{ {
AssertOnWorkQueue(); AssertOnWorkQueue();

14
lib/perfdata/elasticsearchwriter.hpp
View File

@ -42,16 +42,14 @@ private:
void AddCheckResult(const Dictionary::Ptr& fields, const Checkable::Ptr& checkable, const CheckResult::Ptr& cr); void AddCheckResult(const Dictionary::Ptr& fields, const Checkable::Ptr& checkable, const CheckResult::Ptr& cr);
void AddTemplateTags(const Dictionary::Ptr& fields, const Checkable::Ptr& checkable, const CheckResult::Ptr& cr); void AddTemplateTags(const Dictionary::Ptr& fields, const Checkable::Ptr& checkable, const CheckResult::Ptr& cr);
void StateChangeHandler(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr, StateType type); void StateChangeHandler(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr);
void StateChangeHandlerInternal(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr, StateType type); void StateChangeHandlerInternal(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr);
void CheckResultHandler(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr); void CheckResultHandler(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr);
void InternalCheckResultHandler(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr); void InternalCheckResultHandler(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr);
void NotificationSentToAllUsersHandler(const Notification::Ptr& notification, void NotificationSentToAllUsersHandler(const Checkable::Ptr& checkable, const std::set<User::Ptr>& users,
const Checkable::Ptr& checkable, const std::set<User::Ptr>& users, NotificationType type, NotificationType type, const CheckResult::Ptr& cr, const String& author, const String& text);
const CheckResult::Ptr& cr, const String& author, const String& text); void NotificationSentToAllUsersHandlerInternal(const Checkable::Ptr& checkable, const std::set<User::Ptr>& users,
void NotificationSentToAllUsersHandlerInternal(const Notification::Ptr& notification, NotificationType type, const CheckResult::Ptr& cr, const String& author, const String& text);
const Checkable::Ptr& checkable, const std::set<User::Ptr>& users, NotificationType type,
const CheckResult::Ptr& cr, const String& author, const String& text);
void Enqueue(const Checkable::Ptr& checkable, const String& type, void Enqueue(const Checkable::Ptr& checkable, const String& type,
const Dictionary::Ptr& fields, double ts); const Dictionary::Ptr& fields, double ts);

30
lib/perfdata/gelfwriter.cpp
View File

@ -94,14 +94,14 @@ void GelfWriter::Resume()
const CheckResult::Ptr& cr, const MessageOrigin::Ptr&) { const CheckResult::Ptr& cr, const MessageOrigin::Ptr&) {
CheckResultHandler(checkable, cr); CheckResultHandler(checkable, cr);
}); });
m_HandleNotifications = Checkable::OnNotificationSentToUser.connect([this](const Notification::Ptr& notification, m_HandleNotifications = Checkable::OnNotificationSentToUser.connect([this](const Notification::Ptr&,
const Checkable::Ptr& checkable, const User::Ptr& user, const NotificationType& type, const CheckResult::Ptr& cr, const Checkable::Ptr& checkable, const User::Ptr&, const NotificationType& type, const CheckResult::Ptr& cr,
const String& author, const String& commentText, const String& commandName, const MessageOrigin::Ptr&) { const String& author, const String& commentText, const String& commandName, const MessageOrigin::Ptr&) {
NotificationToUserHandler(notification, checkable, user, type, cr, author, commentText, commandName); NotificationToUserHandler(checkable, type, cr, author, commentText, commandName);
}); });
m_HandleStateChanges = Checkable::OnStateChange.connect([this](const Checkable::Ptr& checkable, m_HandleStateChanges = Checkable::OnStateChange.connect([this](const Checkable::Ptr& checkable,
const CheckResult::Ptr& cr, StateType type, const MessageOrigin::Ptr&) { const CheckResult::Ptr& cr, StateType, const MessageOrigin::Ptr&) {
StateChangeHandler(checkable, cr, type); StateChangeHandler(checkable, cr);
}); });
} }
@ -362,21 +362,19 @@ void GelfWriter::CheckResultHandlerInternal(const Checkable::Ptr& checkable, con
SendLogMessage(checkable, ComposeGelfMessage(fields, GetSource(), cr->GetExecutionEnd())); SendLogMessage(checkable, ComposeGelfMessage(fields, GetSource(), cr->GetExecutionEnd()));
} }
void GelfWriter::NotificationToUserHandler(const Notification::Ptr& notification, const Checkable::Ptr& checkable, void GelfWriter::NotificationToUserHandler(const Checkable::Ptr& checkable, NotificationType notificationType,
const User::Ptr& user, NotificationType notificationType, CheckResult::Ptr const& cr, CheckResult::Ptr const& cr, const String& author, const String& commentText, const String& commandName)
const String& author, const String& commentText, const String& commandName)
{ {
if (IsPaused()) if (IsPaused())
return; return;
m_WorkQueue.Enqueue([this, notification, checkable, user, notificationType, cr, author, commentText, commandName]() { m_WorkQueue.Enqueue([this, checkable, notificationType, cr, author, commentText, commandName]() {
NotificationToUserHandlerInternal(notification, checkable, user, notificationType, cr, author, commentText, commandName); NotificationToUserHandlerInternal(checkable, notificationType, cr, author, commentText, commandName);
}); });
} }
void GelfWriter::NotificationToUserHandlerInternal(const Notification::Ptr& notification, const Checkable::Ptr& checkable, void GelfWriter::NotificationToUserHandlerInternal(const Checkable::Ptr& checkable, NotificationType notificationType,
const User::Ptr& user, NotificationType notificationType, CheckResult::Ptr const& cr, CheckResult::Ptr const& cr, const String& author, const String& commentText, const String& commandName)
const String& author, const String& commentText, const String& commandName)
{ {
AssertOnWorkQueue(); AssertOnWorkQueue();
@ -428,15 +426,15 @@ void GelfWriter::NotificationToUserHandlerInternal(const Notification::Ptr& noti
SendLogMessage(checkable, ComposeGelfMessage(fields, GetSource(), ts)); SendLogMessage(checkable, ComposeGelfMessage(fields, GetSource(), ts));
} }
void GelfWriter::StateChangeHandler(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr, StateType type) void GelfWriter::StateChangeHandler(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr)
{ {
if (IsPaused()) if (IsPaused())
return; return;
m_WorkQueue.Enqueue([this, checkable, cr, type]() { StateChangeHandlerInternal(checkable, cr, type); }); m_WorkQueue.Enqueue([this, checkable, cr]() { StateChangeHandlerInternal(checkable, cr); });
} }
void GelfWriter::StateChangeHandlerInternal(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr, StateType type) void GelfWriter::StateChangeHandlerInternal(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr)
{ {
AssertOnWorkQueue(); AssertOnWorkQueue();

14
lib/perfdata/gelfwriter.hpp
View File

@ -41,14 +41,12 @@ private:
void CheckResultHandler(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr); void CheckResultHandler(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr);
void CheckResultHandlerInternal(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr); void CheckResultHandlerInternal(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr);
void NotificationToUserHandler(const Notification::Ptr& notification, const Checkable::Ptr& checkable, void NotificationToUserHandler(const Checkable::Ptr& checkable, NotificationType notificationType,
const User::Ptr& user, NotificationType notificationType, const CheckResult::Ptr& cr, const CheckResult::Ptr& cr, const String& author, const String& commentText, const String& commandName);
const String& author, const String& commentText, const String& commandName); void NotificationToUserHandlerInternal(const Checkable::Ptr& checkable, NotificationType notification_type,
void NotificationToUserHandlerInternal(const Notification::Ptr& notification, const Checkable::Ptr& checkable, const CheckResult::Ptr& cr, const String& author, const String& comment_text, const String& command_name);
const User::Ptr& user, NotificationType notification_type, const CheckResult::Ptr& cr, void StateChangeHandler(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr);
const String& author, const String& comment_text, const String& command_name); void StateChangeHandlerInternal(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr);
void StateChangeHandler(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr, StateType type);
void StateChangeHandlerInternal(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr, StateType type);
String ComposeGelfMessage(const Dictionary::Ptr& fields, const String& source, double ts); String ComposeGelfMessage(const Dictionary::Ptr& fields, const String& source, double ts);
void SendLogMessage(const Checkable::Ptr& checkable, const String& gelfMessage); void SendLogMessage(const Checkable::Ptr& checkable, const String& gelfMessage);