]> granicus.if.org Git - icinga2/commitdiff
Add log message for config/status dump end for Redis
authorMichael Friedrich <michael.friedrich@icinga.com>
Fri, 24 Mar 2017 13:39:24 +0000 (14:39 +0100)
committerMichael Friedrich <michael.friedrich@icinga.com>
Wed, 29 Mar 2017 08:17:03 +0000 (10:17 +0200)
refs #4991

lib/redis/rediswriter-config.cpp
lib/redis/rediswriter.cpp

index 834a85d2890d7cdee8bc691f972f7f83aab7a448..236c1fcb124e9eea928ac4eb795809f1753000a4 100644 (file)
@@ -60,6 +60,8 @@ void RedisWriter::UpdateAllConfigObjects(void)
 {
        AssertOnWorkQueue();
 
+       double startTime = Utility::GetTime();
+
        //TODO: "Publish" the config dump by adding another event, globally or by object
        ExecuteQuery({ "MULTI" });
 
@@ -86,6 +88,9 @@ void RedisWriter::UpdateAllConfigObjects(void)
        }
 
        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)
index 64cc471c16b744cfc4d5c8fe7d8f1c138f1c58e5..010499387e81e2d257a21a2cb4de3672556e3f9c 100644 (file)
@@ -97,6 +97,9 @@ void RedisWriter::TryToReconnect(void)
 
        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())
                ExecuteQuery({ "AUTH", password });