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

Merge pull request #6917 from Icinga/bugfix/cluster-message-delete-object 

Cluster: Delete object message should log that
This commit is contained in:
Michael Friedrich 2019-01-29 13:37:50 +01:00 committed by GitHub
parent feea76a80d b16c22448e
commit 530f890cab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/remote/apilistener-configsync.cpp
View File

@ -199,7 +199,7 @@ Value ApiListener::ConfigUpdateObjectAPIHandler(const MessageOrigin::Ptr& origin
Value ApiListener::ConfigDeleteObjectAPIHandler(const MessageOrigin::Ptr& origin, const Dictionary::Ptr& params) Value ApiListener::ConfigDeleteObjectAPIHandler(const MessageOrigin::Ptr& origin, const Dictionary::Ptr& params)
{ {
Log(LogNotice, "ApiListener") Log(LogNotice, "ApiListener")
<< "Received update for object: " << JsonEncode(params); << "Received delete for object: " << JsonEncode(params);
/* check permissions */ /* check permissions */
ApiListener::Ptr listener = ApiListener::GetInstance(); ApiListener::Ptr listener = ApiListener::GetInstance();
@ -209,7 +209,7 @@ Value ApiListener::ConfigDeleteObjectAPIHandler(const MessageOrigin::Ptr& origin
if (!listener->GetAcceptConfig()) { if (!listener->GetAcceptConfig()) {
Log(LogWarning, "ApiListener") Log(LogWarning, "ApiListener")
<< "Ignoring config update. '" << listener->GetName() << "' does not accept config."; << "Ignoring config delete. '" << listener->GetName() << "' does not accept config.";
return Empty; return Empty;
} }
@ -217,14 +217,14 @@ Value ApiListener::ConfigDeleteObjectAPIHandler(const MessageOrigin::Ptr& origin
if (!endpoint) { if (!endpoint) {
Log(LogNotice, "ApiListener") Log(LogNotice, "ApiListener")
<< "Discarding 'config update object' message from '" << origin->FromClient->GetIdentity() << "': Invalid endpoint origin (client not allowed)."; << "Discarding 'config delete object' message from '" << origin->FromClient->GetIdentity() << "': Invalid endpoint origin (client not allowed).";
return Empty; return Empty;
} }
/* discard messages if the sender is in a child zone */ /* discard messages if the sender is in a child zone */
if (!Zone::GetLocalZone()->IsChildOf(endpoint->GetZone())) { if (!Zone::GetLocalZone()->IsChildOf(endpoint->GetZone())) {
Log(LogNotice, "ApiListener") Log(LogNotice, "ApiListener")
<< "Discarding 'config update object' message from '" << "Discarding 'config delete object' message from '"
<< origin->FromClient->GetIdentity() << "'."; << origin->FromClient->GetIdentity() << "'.";
return Empty; return Empty;
} }