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

IcingaDB: use XADD MAXLEN instead of custom Lua script for dump signals 

The existing Lua script adds a new entry to a stream and then deletes all older
entries. The same can be achieved by using `XADD ... MAXLEN 1`.
This commit is contained in:
Julian Brost 2021-04-21 15:03:11 +02:00
parent b08b30ee80
commit 9dd210df84
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/icingadb/icingadb-objects.cpp
View File

@ -40,19 +40,6 @@ using namespace icinga;
using Prio = RedisConnection::QueryPriority;
static const char * const l_LuaResetDump = R"EOF(
local id = redis.call('XADD', KEYS[1], '*', 'key', '*', 'state', 'wip')
local xr = redis.call('XRANGE', KEYS[1], '-', '+')
for i = 1, #xr - 1 do
redis.call('XDEL', KEYS[1], xr[i][1])
end
return id
)EOF";
INITIALIZE_ONCE(&IcingaDB::ConfigStaticInitialize);
void IcingaDB::ConfigStaticInitialize()
@ -151,7 +138,8 @@ void IcingaDB::UpdateAllConfigObjects()
m_Rcon->UnsuppressQueryKind(Prio::CheckResult);
});
m_Rcon->FireAndForgetQuery({"EVAL", l_LuaResetDump, "1", "icinga:dump"}, Prio::Config);
// Add a new type=* state=wip entry to the stream and remove all previous entries (MAXLEN 1).
m_Rcon->FireAndForgetQuery({"XADD", "icinga:dump", "MAXLEN", "1", "*", "key", "*", "state", "wip"}, Prio::Config);
const std::vector<String> globalKeys = {
m_PrefixConfigObject + "customvar",