feat: able to create cluster from servers behind NAT (#1513)

projectoperations · Aug 22, 2023 · 1ec9918 · 1ec9918
1 parent 8f2d9b6
commit 1ec9918
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/server-core/src/main/java/io/onedev/server/OneDev.java b/server-core/src/main/java/io/onedev/server/OneDev.java
@@ -158,6 +158,9 @@ public void start() {
 				} catch (InterruptedException e) {
 					throw new RuntimeException(e);
 				}
+				if (thread == null)
+					return;
+
 				manualConfigs = checkData();
 				if (manualConfigs.isEmpty()) {
 					initStage = new InitStage("Please wait...");
@@ -200,12 +203,14 @@ public void start() {
 	@Sessional
 	@Override
 	public void postStart() {
+		if (thread == null) 
+			return;
 		SecurityUtils.bindAsSystem();
 		initStage = null;
 		listenerRegistry.post(new SystemStarted());
 		clusterManager.postStart();
 		thread.start();
-        logger.info("Server is ready at " + guessServerUrl());
+		logger.info("Server is ready at " + guessServerUrl());
 	}
 
 	@Override

diff --git a/server-core/src/main/java/io/onedev/server/cluster/DefaultClusterManager.java b/server-core/src/main/java/io/onedev/server/cluster/DefaultClusterManager.java
@@ -141,12 +141,14 @@ public void start() {
 				hasLocalhost = true;
 			else 
 				hasNonLocalhost = true;
-			config.getNetworkConfig().getJoin().getTcpIpConfig().addMember(server);
+			if (!server.equals(localServer))
+				config.getNetworkConfig().getJoin().getTcpIpConfig().addMember(server);
 		}
 		if (hasLocalhost && hasNonLocalhost)
 			throw new ExplicitException("Invalid servers detected in cluster: loopback address should not be used");
-
+		config.getNetworkConfig().setPublicAddress(localServer);
 		hazelcastInstance = Hazelcast.newHazelcastInstance(config);
+
 		hazelcastInstance.getCluster().addMembershipListener(new MembershipListener() {
 			@Override
 			public void memberAdded(MembershipEvent membershipEvent) {