tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-09-13 04:48:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8189 from Icinga/bugfix/last-zone-sync-stage-validation-failed-7642

Browse Source 
Clear ApiListener#last_failed_zones_stage_validation on config::Update if config not changed
This commit is contained in:
Noah Hilverling 2020-09-14 09:41:05 +02:00 committed by GitHub
commit 7ec7cae4b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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

@ -312,7 +312,7 @@ Value ApiListener::ConfigUpdateHandler(const MessageOrigin::Ptr& origin, const D
return Empty;
}
std::thread([origin, params]() { HandleConfigUpdate(origin, params); }).detach();
std::thread([origin, params, listener]() { listener->HandleConfigUpdate(origin, params); }).detach();
return Empty;
}
@ -534,6 +534,7 @@ void ApiListener::HandleConfigUpdate(const MessageOrigin::Ptr& origin, const Dic
Log(LogInformation, "ApiListener")
<< "Received configuration updates (" << count << ") from endpoint '" << fromEndpointName
<< "' are equal to production, skipping validation and reload.";
ClearLastFailedZonesStageValidation();
}
}

2
lib/remote/apilistener.hpp
View File

@ -85,7 +85,7 @@ public:
/* filesync */
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 */
static void ConfigUpdateObjectHandler(const ConfigObject::Ptr& object, const Value& cookie);