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

Clear ApiListener#last_failed_zones_stage_validation on config::Update if config not changed 

refs #7642
This commit is contained in:
Alexander A. Klimov 2020-09-11 13:38:35 +02:00
parent 876fa8ba97
commit fbfa931b31
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/remote/apilistener-filesync.cpp
View File

@ -314,7 +314,7 @@ Value ApiListener::ConfigUpdateHandler(const MessageOrigin::Ptr& origin, const D
std::thread([origin, params, listener]() { std::thread([origin, params, listener]() {
try { try {
HandleConfigUpdate(origin, params); listener->HandleConfigUpdate(origin, params);
} catch (const std::exception& ex) { } catch (const std::exception& ex) {
auto msg ("Exception during config sync: " + DiagnosticInformation(ex)); auto msg ("Exception during config sync: " + DiagnosticInformation(ex));
@ -543,6 +543,7 @@ void ApiListener::HandleConfigUpdate(const MessageOrigin::Ptr& origin, const Dic
Log(LogInformation, "ApiListener") Log(LogInformation, "ApiListener")
<< "Received configuration updates (" << count << ") from endpoint '" << fromEndpointName << "Received configuration updates (" << count << ") from endpoint '" << fromEndpointName
<< "' are equal to production, skipping validation and reload."; << "' are equal to production, skipping validation and reload.";
ClearLastFailedZonesStageValidation();
} }
} }

2
lib/remote/apilistener.hpp
View File

@ -85,7 +85,7 @@ public:
/* filesync */ /* filesync */
static Value ConfigUpdateHandler(const MessageOrigin::Ptr& origin, const Dictionary::Ptr& params); static Value ConfigUpdateHandler(const MessageOrigin::Ptr& origin, const Dictionary::Ptr& params);
static void HandleConfigUpdate(const MessageOrigin::Ptr& origin, const Dictionary::Ptr& params); void HandleConfigUpdate(const MessageOrigin::Ptr& origin, const Dictionary::Ptr& params);
/* configsync */ /* configsync */
static void ConfigUpdateObjectHandler(const ConfigObject::Ptr& object, const Value& cookie); static void ConfigUpdateObjectHandler(const ConfigObject::Ptr& object, const Value& cookie);