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

Add log message for config/status dump end for Redis

Browse Source 
refs #4991
This commit is contained in:
Michael Friedrich 2017-03-24 14:39:24 +01:00
parent 91b8decaac
commit a5556cbaae
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/redis/rediswriter-config.cpp
View File

@ -60,6 +60,8 @@ void RedisWriter::UpdateAllConfigObjects(void)
{ {
AssertOnWorkQueue(); AssertOnWorkQueue();
double startTime = Utility::GetTime();
//TODO: "Publish" the config dump by adding another event, globally or by object //TODO: "Publish" the config dump by adding another event, globally or by object
ExecuteQuery({ "MULTI" }); ExecuteQuery({ "MULTI" });
@ -86,6 +88,9 @@ void RedisWriter::UpdateAllConfigObjects(void)
} }
ExecuteQuery({ "EXEC" }); ExecuteQuery({ "EXEC" });
Log(LogInformation, "RedisWriter")
<< "Initial config/status dump finished in " << Utility::GetTime() - startTime << " seconds.";
} }
void RedisWriter::SendConfigUpdate(const ConfigObject::Ptr& object, const String& typeName, bool runtimeUpdate) void RedisWriter::SendConfigUpdate(const ConfigObject::Ptr& object, const String& typeName, bool runtimeUpdate)

3
lib/redis/rediswriter.cpp
View File

@ -97,6 +97,9 @@ void RedisWriter::TryToReconnect(void)
String password = GetPassword(); String password = GetPassword();
/* TODO: exception is fired but terminates reconnect silently.
* Error case: Password does not match, or even: "Client sent AUTH, but no password is set" which also results in an error.
*/
if (!password.IsEmpty()) if (!password.IsEmpty())
ExecuteQuery({ "AUTH", password }); ExecuteQuery({ "AUTH", password });