tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove unused parameter.

This commit is contained in:
Gunnar Beutner 2013-09-25 11:21:20 +02:00
parent 463cc53dca
commit 033b06e66a
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/db_ido/servicedbobject.cpp
View File

@ -49,7 +49,7 @@ void ServiceDbObject::StaticInitialize(void)
/* History */
Service::OnAcknowledgementSet.connect(boost::bind(&ServiceDbObject::AddAcknowledgement, _1, _2, _3, _4, _5, _6));
Service::OnNotificationSentToAllUsers.connect(bind(&ServiceDbObject::AddNotification, _1, _2, _3, _4, _5, _6, _7));
Service::OnNotificationSentToAllUsers.connect(bind(&ServiceDbObject::AddNotification, _1, _2, _3, _4, _5, _6));
}
ServiceDbObject::ServiceDbObject(const DbType::Ptr& type, const String& name1, const String& name2)
@ -786,7 +786,7 @@ void ServiceDbObject::AddAcknowledgement(const Service::Ptr& service, const Stri
}
void ServiceDbObject::AddNotification(const Service::Ptr& service, const std::set<User::Ptr>& users, NotificationType type,
const Dictionary::Ptr& cr, const String& author, const String& text, unsigned long notified_users)
const Dictionary::Ptr& cr, const String& author, const String& text)
{
Host::Ptr host = service->GetHost();
@ -823,7 +823,7 @@ void ServiceDbObject::AddNotification(const Service::Ptr& service, const std::se
}
fields1->Set("escalated", 0);
fields1->Set("contacts_notified", notified_users);
fields1->Set("contacts_notified", users.size());
fields1->Set("instance_id", 0); /* DbConnection class fills in real ID */
query1.Fields = fields1;
@ -856,7 +856,7 @@ void ServiceDbObject::AddNotification(const Service::Ptr& service, const std::se
}
fields2->Set("escalated", 0);
fields2->Set("contacts_notified", notified_users);
fields2->Set("contacts_notified", users.size());
fields2->Set("instance_id", 0); /* DbConnection class fills in real ID */
query2.Fields = fields2;

2
lib/db_ido/servicedbobject.h
View File

@ -67,7 +67,7 @@ private:
/* History */
static void AddAcknowledgement(const Service::Ptr& service, const String& author, const String& comment, AcknowledgementType type, double expiry, const String& authority);
static void AddNotification(const Service::Ptr& service, const std::set<User::Ptr>& users, NotificationType type, const Dictionary::Ptr& cr, const String& author, const String& text, unsigned long notified_users);
static void AddNotification(const Service::Ptr& service, const std::set<User::Ptr>& users, NotificationType type, const Dictionary::Ptr& cr, const String& author, const String& text);
};

2
lib/icinga/notification.cpp
View File

@ -303,7 +303,7 @@ void Notification::BeginExecuteNotification(NotificationType type, const Diction
notified_users++;
}
Service::OnNotificationSentToAllUsers(GetService(), allUsers, type, cr, author, text, notified_users);
Service::OnNotificationSentToAllUsers(GetService(), allUsers, type, cr, author, text);
}
void Notification::ExecuteNotificationHelper(NotificationType type, const User::Ptr& user, const Dictionary::Ptr& cr, bool force, const String& author, const String& text)

2
lib/icinga/service-notification.cpp
View File

@ -31,7 +31,7 @@
using namespace icinga;
boost::signals2::signal<void (const Service::Ptr&, const std::set<User::Ptr>&, const NotificationType&, const Dictionary::Ptr&, const String&, const String&, unsigned long)> Service::OnNotificationSentToAllUsers;
boost::signals2::signal<void (const Service::Ptr&, const std::set<User::Ptr>&, const NotificationType&, const Dictionary::Ptr&, const String&, const String&)> Service::OnNotificationSentToAllUsers;
boost::signals2::signal<void (const Service::Ptr&, const User::Ptr&, const NotificationType&, const Dictionary::Ptr&, const String&, const String&)> Service::OnNotificationSentToUser;
Dictionary::Ptr Service::GetNotificationDescriptions(void) const

2
lib/icinga/service.h
View File

@ -240,7 +240,7 @@ public:
static boost::signals2::signal<void (const Service::Ptr&, const Dictionary::Ptr&, const String&)> OnNewCheckResult;
static boost::signals2::signal<void (const Service::Ptr&, NotificationType, const Dictionary::Ptr&, const String&, const String&)> OnNotificationsRequested;
static boost::signals2::signal<void (const Service::Ptr&, const User::Ptr&, const NotificationType&, const Dictionary::Ptr&, const String&, const String&)> OnNotificationSentToUser;
static boost::signals2::signal<void (const Service::Ptr&, const std::set<User::Ptr>&, const NotificationType&, const Dictionary::Ptr&, const String&, const String&, unsigned long)> OnNotificationSentToAllUsers;
static boost::signals2::signal<void (const Service::Ptr&, const std::set<User::Ptr>&, const NotificationType&, const Dictionary::Ptr&, const String&, const String&)> OnNotificationSentToAllUsers;
static boost::signals2::signal<void (const Service::Ptr&, const Dictionary::Ptr&, const String&)> OnCommentAdded;
static boost::signals2::signal<void (const Service::Ptr&, const Dictionary::Ptr&, const String&)> OnCommentRemoved;
static boost::signals2::signal<void (const Service::Ptr&, const Dictionary::Ptr&, const String&)> OnDowntimeAdded;