]> granicus.if.org Git - icinga2/commitdiff
cluster: Don't try to reconnect while we're replaying the log.
authorGunnar Beutner <gunnar.beutner@netways.de>
Wed, 11 Sep 2013 07:01:00 +0000 (09:01 +0200)
committerGunnar Beutner <gunnar.beutner@netways.de>
Wed, 11 Sep 2013 07:01:00 +0000 (09:01 +0200)
components/cluster/clustercomponent.cpp

index fdb36ac0174d99e36fce3fb78d1e14f327766115..80790df0bde5747aff1da2b17c6e0020cbbad441 100644 (file)
@@ -435,10 +435,9 @@ void ClusterComponent::NewClientHandler(const Socket::Ptr& client, TlsRole role)
 
        {
                ObjectLock olock(this);
+               endpoint->SetClient(tlsStream);
                ReplayLog(endpoint, tlsStream);
        }
-
-       endpoint->SetClient(tlsStream);
 }
 
 void ClusterComponent::ClusterTimerHandler(void)
@@ -1089,8 +1088,6 @@ void ClusterComponent::MessageHandler(const Endpoint::Ptr& sender, const Diction
                        Log(LogInformation, "cluster", "Restarting after configuration change.");
                        Application::RequestRestart();
                }
-
-               /* TODO: update files, remove old files, figure out whether we need to restart */
        }
 }