From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Wed, 11 Sep 2013 07:01:00 +0000 (+0200)
Subject: cluster: Don't try to reconnect while we're replaying the log.
X-Git-Tag: v0.0.3~568
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fe13be0e9cc0f42dd3cba281e19ff4d83658cfa3;p=icinga2

cluster: Don't try to reconnect while we're replaying the log.
---

diff --git a/components/cluster/clustercomponent.cpp b/components/cluster/clustercomponent.cpp
index fdb36ac01..80790df0b 100644
--- a/components/cluster/clustercomponent.cpp
+++ b/components/cluster/clustercomponent.cpp
@@ -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 */
 	}
 }