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 #8088 from Icinga/bugfix/log-two-nodes-run-on-different-versions-8075 

Display logmessage if two nodes run on different versions
This commit is contained in:
Alexander Aleksandrovič Klimov 2021-01-11 12:30:30 +01:00 committed by GitHub
parent 862add5f3f 8eb4f2e062
commit 635a8c5d4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/remote/apilistener.cpp
View File

@ -1643,6 +1643,11 @@ std::set<HttpServerConnection::Ptr> ApiListener::GetHttpClients() const
return m_HttpClients;
}
static void LogAppVersion(unsigned long version, Log& log)
{
log << version / 100u << "." << version % 100u << ".x";
}
Value ApiListener::HelloAPIHandler(const MessageOrigin::Ptr& origin, const Dictionary::Ptr& params)
{
if (origin) {
@ -1652,8 +1657,33 @@ Value ApiListener::HelloAPIHandler(const MessageOrigin::Ptr& origin, const Dicti
auto endpoint (client->GetEndpoint());
if (endpoint) {
endpoint->SetIcingaVersion((double)params->Get("version"));
unsigned long nodeVersion = params->Get("version");
endpoint->SetIcingaVersion(nodeVersion);
endpoint->SetCapabilities((double)params->Get("capabilities"));
if (nodeVersion == 0u) {
nodeVersion = 21200;
}
if (endpoint->GetZone()->GetParent() == Zone::GetLocalZone()) {
switch (l_AppVersionInt / 100 - nodeVersion / 100) {
case 0:
case 1:
break;
default:
Log log (LogWarning, "ApiListener");
log << "Unexpected Icinga version of endpoint '" << endpoint->GetName() << "': ";
LogAppVersion(nodeVersion / 100u, log);
log << " Expected one of: ";
LogAppVersion(l_AppVersionInt / 100u, log);
log << ", ";
LogAppVersion((l_AppVersionInt / 100u - 1u), log);
}
}
}
}
}