ido: Fixes for comments.

refs #4380

diff --git a/lib/icinga/service-comment.cpp b/lib/icinga/service-comment.cpp
index 850835d52567a7b2193f947b9082960066a76eba..874dccaa08bbf48837ec8189e829961867deef2c 100644 (file)
--- a/lib/icinga/service-comment.cpp
+++ b/lib/icinga/service-comment.cpp
@@ -250,8 +250,6 @@ void Service::RefreshCommentsCache(void)
                l_CommentsExpireTimer->OnTimerExpired.connect(boost::bind(&Service::CommentsExpireTimerHandler));
                l_CommentsExpireTimer->Start();
        }
-
-       OnCommentsChanged(Service::Ptr(), Empty, CommentChangedUpdated);
 }
 
 void Service::RemoveCommentsByType(int type)

diff --git a/lib/ido/servicedbobject.cpp b/lib/ido/servicedbobject.cpp
index 7b8bbd25b321fafcbb2aa358c9c0e7bacb26dc1e..33543e3da10750a63069600ed2158ca1a9976970 100644 (file)
--- a/lib/ido/servicedbobject.cpp
+++ b/lib/ido/servicedbobject.cpp
@@ -204,6 +204,9 @@ void ServiceDbObject::OnConfigUpdate(void)
                 OnQuery(query1);
        }
 
+       /* update comments */
+       OnCommentsChanged(service, Empty, CommentChangedUpdated);
+
        /* service host config update */
        Host::Ptr host = service->GetHost();
 
@@ -344,7 +347,7 @@ void ServiceDbObject::CommentsChangedHandler(const Service::Ptr& svcfilter, cons
                /* newly added comment */
                Log(LogDebug, "ido", "adding service comment (id = " + id + ") for '" + service->GetName() + "'");
 
-               entry_time = static_cast<long>(comment->Get("entry_time"));
+               entry_time = static_cast<long>(add_comment->Get("entry_time"));
                entry_time_usec = (add_comment->Get("entry_time") - entry_time) * 1000 * 1000;
 
                fields2 = boost::make_shared<Dictionary>();