From 9ac731ba8eaab53163373b402f2b77e7917056f2 Mon Sep 17 00:00:00 2001
From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Fri, 15 Mar 2013 11:18:56 +0100
Subject: [PATCH] Change log level for some debug messages.

---
 lib/icinga/host.cpp                 | 2 +-
 lib/icinga/hostgroup.cpp            | 2 +-
 lib/icinga/service-check.cpp        | 6 ++----
 lib/icinga/service-comment.cpp      | 2 +-
 lib/icinga/service-downtime.cpp     | 2 +-
 lib/icinga/service-notification.cpp | 2 +-
 lib/icinga/servicegroup.cpp         | 2 +-
 lib/icinga/usergroup.cpp            | 2 +-
 8 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/lib/icinga/host.cpp b/lib/icinga/host.cpp
index 229e507d5..53306b8bf 100644
--- a/lib/icinga/host.cpp
+++ b/lib/icinga/host.cpp
@@ -348,7 +348,7 @@ void Host::RefreshServicesCache(void)
 		m_ServicesCacheNeedsUpdate = false;
 	}
 
-	Logger::Write(LogInformation, "icinga", "Updating Host services cache.");
+	Logger::Write(LogDebug, "icinga", "Updating Host services cache.");
 
 	map<String, map<String, Service::WeakPtr> > newServicesCache;
 
diff --git a/lib/icinga/hostgroup.cpp b/lib/icinga/hostgroup.cpp
index d1dea90c5..3ed2141f8 100644
--- a/lib/icinga/hostgroup.cpp
+++ b/lib/icinga/hostgroup.cpp
@@ -148,7 +148,7 @@ void HostGroup::RefreshMembersCache(void)
 		m_MembersCacheNeedsUpdate = false;
 	}
 
-	Logger::Write(LogInformation, "icinga", "Updating HostGroup members cache.");
+	Logger::Write(LogDebug, "icinga", "Updating HostGroup members cache.");
 
 	map<String, vector<Host::WeakPtr> > newMembersCache;
 
diff --git a/lib/icinga/service-check.cpp b/lib/icinga/service-check.cpp
index fcd8bccb4..f5fe1117f 100644
--- a/lib/icinga/service-check.cpp
+++ b/lib/icinga/service-check.cpp
@@ -676,10 +676,8 @@ void Service::CheckCompletedHandler(const Dictionary::Ptr& checkInfo,
 		if (!result->Contains("active"))
 			result->Set("active", 1);
 
-		if (!result->Contains("current_checker")) {
-			EndpointManager::Ptr em = EndpointManager::GetInstance();
-			result->Set("current_checker", em->GetIdentity());
-		}
+		if (!result->Contains("current_checker"))
+			result->Set("current_checker", EndpointManager::GetInstance()->GetIdentity());
 	}
 
 	if (result)
diff --git a/lib/icinga/service-comment.cpp b/lib/icinga/service-comment.cpp
index 823b850ec..3844c9635 100644
--- a/lib/icinga/service-comment.cpp
+++ b/lib/icinga/service-comment.cpp
@@ -204,7 +204,7 @@ void Service::RefreshCommentsCache(void)
 		m_CommentsCacheNeedsUpdate = false;
 	}
 
-	Logger::Write(LogInformation, "icinga", "Updating Service comments cache.");
+	Logger::Write(LogDebug, "icinga", "Updating Service comments cache.");
 
 	map<int, String> newLegacyCommentsCache;
 	map<String, Service::WeakPtr> newCommentsCache;
diff --git a/lib/icinga/service-downtime.cpp b/lib/icinga/service-downtime.cpp
index fb608f591..47a6a86c1 100644
--- a/lib/icinga/service-downtime.cpp
+++ b/lib/icinga/service-downtime.cpp
@@ -278,7 +278,7 @@ void Service::RefreshDowntimesCache(void)
 		m_DowntimesCacheNeedsUpdate = false;
 	}
 
-	Logger::Write(LogInformation, "icinga", "Updating Service downtimes cache.");
+	Logger::Write(LogDebug, "icinga", "Updating Service downtimes cache.");
 
 	map<int, String> newLegacyDowntimesCache;
 	map<String, Service::WeakPtr> newDowntimesCache;
diff --git a/lib/icinga/service-notification.cpp b/lib/icinga/service-notification.cpp
index 2c3e29108..138c2c430 100644
--- a/lib/icinga/service-notification.cpp
+++ b/lib/icinga/service-notification.cpp
@@ -115,7 +115,7 @@ void Service::RefreshNotificationsCache(void)
 		m_NotificationsCacheNeedsUpdate = false;
 	}
 
-	Logger::Write(LogInformation, "icinga", "Updating Service notifications cache.");
+	Logger::Write(LogDebug, "icinga", "Updating Service notifications cache.");
 
 	map<String, set<Notification::WeakPtr> > newNotificationsCache;
 
diff --git a/lib/icinga/servicegroup.cpp b/lib/icinga/servicegroup.cpp
index a9abdec7e..a6f457749 100644
--- a/lib/icinga/servicegroup.cpp
+++ b/lib/icinga/servicegroup.cpp
@@ -148,7 +148,7 @@ void ServiceGroup::RefreshMembersCache(void)
 		m_MembersCacheNeedsUpdate = false;
 	}
 
-	Logger::Write(LogInformation, "icinga", "Updating ServiceGroup members cache.");
+	Logger::Write(LogDebug, "icinga", "Updating ServiceGroup members cache.");
 
 	map<String, vector<Service::WeakPtr> > newMembersCache;
 
diff --git a/lib/icinga/usergroup.cpp b/lib/icinga/usergroup.cpp
index f79976f97..8c6004b7c 100644
--- a/lib/icinga/usergroup.cpp
+++ b/lib/icinga/usergroup.cpp
@@ -130,7 +130,7 @@ void UserGroup::RefreshMembersCache(void)
 		m_MembersCacheNeedsUpdate = false;
 	}
 
-	Logger::Write(LogInformation, "icinga", "Updating UserGroup members cache.");
+	Logger::Write(LogDebug, "icinga", "Updating UserGroup members cache.");
 
 	map<String, vector<User::WeakPtr> > newMembersCache;