tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-26 23:24:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

RedisWriter#SendStatusUpdate(): handle pending checkable

Browse Source
This commit is contained in:
Alexander A. Klimov 2019-10-21 16:49:53 +02:00 committed by Michael Friedrich
parent 82898b31ae
commit 747521fa84
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/redis/rediswriter-objects.cpp
View File

@ -1171,20 +1171,20 @@ void RedisWriter::SendStatusUpdate(const ConfigObject::Ptr& object, const CheckR
m_Rcon->FireAndForgetQuery(std::move(streamadd)); m_Rcon->FireAndForgetQuery(std::move(streamadd));
auto output (SplitOutput(cr->GetOutput())); auto output (SplitOutput(cr ? cr->GetOutput() : ""));
m_Rcon->FireAndForgetQuery({ m_Rcon->FireAndForgetQuery({
"XADD", service ? "icinga:history:stream:service:state" : "icinga:history:stream:host:state", "*", "XADD", service ? "icinga:history:stream:service:state" : "icinga:history:stream:host:state", "*",
"id", Utility::NewUniqueID(), "id", Utility::NewUniqueID(),
"environment_id", SHA1(GetEnvironment()), "environment_id", SHA1(GetEnvironment()),
service ? "service_id" : "host_id", GetObjectIdentifier(checkable), service ? "service_id" : "host_id", GetObjectIdentifier(checkable),
"change_time", Convert::ToString(TimestampToMilliseconds(cr->GetExecutionEnd())), "change_time", Convert::ToString(TimestampToMilliseconds(cr ? cr->GetExecutionEnd() : Utility::GetTime())),
"state_type", Convert::ToString(type), "state_type", Convert::ToString(type),
"soft_state", Convert::ToString(cr->GetState()), "soft_state", Convert::ToString(cr ? cr->GetState() : 99),
"hard_state", Convert::ToString(service ? service->GetLastHardState() : host->GetLastHardState()), "hard_state", Convert::ToString(service ? service->GetLastHardState() : host->GetLastHardState()),
"attempt", Convert::ToString(checkable->GetCheckAttempt()), "attempt", Convert::ToString(checkable->GetCheckAttempt()),
// TODO: last_hard/soft_state should be "previous". // TODO: last_hard/soft_state should be "previous".
"last_soft_state", Convert::ToString(cr->GetState()), "last_soft_state", Convert::ToString(cr ? cr->GetState() : 99),
"last_hard_state", Convert::ToString(service ? service->GetLastHardState() : host->GetLastHardState()), "last_hard_state", Convert::ToString(service ? service->GetLastHardState() : host->GetLastHardState()),
"output", Utility::ValidateUTF8(std::move(output.first)), "output", Utility::ValidateUTF8(std::move(output.first)),
"long_output", Utility::ValidateUTF8(std::move(output.second)), "long_output", Utility::ValidateUTF8(std::move(output.second)),