Fixed for connection failure logging

Author: mikera

convex-peer/src/main/java/convex/api/ConvexRemote.java

@@ -75,7 +75,7 @@ public static ConvexRemote connect(InetSocketAddress peerAddress) throws IOExcep
 		return convex;
 	}
 
-	public static ConvexRemote connectNetty(InetSocketAddress sa) throws InterruptedException {
+	public static ConvexRemote connectNetty(InetSocketAddress sa) throws InterruptedException, IOException {
 		ConvexRemote convex=new ConvexRemote(null,null);
 		convex.remoteAddress=sa;
 		convex.setConnection(NettyConnection.connect(sa, convex.returnMessageHandler));

convex-peer/src/main/java/convex/net/impl/netty/NettyConnection.java

@@ -1,9 +1,13 @@
 package convex.net.impl.netty;
 
+import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import java.util.function.Consumer;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import convex.core.data.Vectors;
 import convex.core.message.Message;
 import convex.core.message.MessageType;
@@ -22,6 +26,8 @@
 
 public class NettyConnection extends AConnection {
 
+	static final Logger log = LoggerFactory.getLogger(NettyConnection.class.getName());
+	
 	/**
 	 * Static client connection worker
 	 */
@@ -80,10 +86,15 @@ public void initChannel(SocketChannel ch) throws Exception {
 			return clientBootstrap;
 		}
 	}
-
-	public static NettyConnection connect(SocketAddress sa, Consumer<Message> receiveAction) throws InterruptedException {
+	
+	public static NettyConnection connect(SocketAddress sa, Consumer<Message> receiveAction) throws InterruptedException, IOException {
 		Bootstrap b = getClientBootstrap();
-		ChannelFuture f = b.connect(sa).sync(); // (5)
+		ChannelFuture f = b.connect(sa);
+		f.await(); // Wait until done
+		
+		if (!f.isSuccess()) {
+			throw new IOException("Failed to connect to peer",f.cause());
+		}
 
 		Channel chan = f.channel();
 		NettyInboundHandler inbound=new NettyInboundHandler(receiveAction,null);

convex-peer/src/main/java/convex/peer/API.java

@@ -5,6 +5,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.TimeoutException;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -176,16 +177,20 @@ public static List<Server> launchLocalPeers(List<AKeyPair> keyPairs, State genes
 
 		genesisServer.setHostname("localhost:"+genesisServer.getPort());
 
-		for (int i = 1; i < count; i++) {
-			Server server=serverList.get(i);
-
-			// Join each additional Server to the Peer #0
-			ConnectionManager cm=server.getConnectionManager();
-			cm.connectToPeer(genesisServer.getHostAddress());
-
-			// Join server #0 to this server
-			genesisServer.getConnectionManager().connectToPeer(server.getHostAddress());
-			server.setHostname("localhost:"+server.getPort());
+		try {
+			for (int i = 1; i < count; i++) {
+				Server server=serverList.get(i);
+	
+				// Join each additional Server to the Peer #0
+				ConnectionManager cm=server.getConnectionManager();
+				cm.connectToPeer(genesisServer.getHostAddress());
+	
+				// Join server #0 to this server
+				genesisServer.getConnectionManager().connectToPeer(server.getHostAddress());
+				server.setHostname("localhost:"+server.getPort());
+			}
+		} catch (IOException|TimeoutException e) {
+			throw new LaunchException("Error setting up peer connections",e);
 		}
 
 		return serverList;

convex-peer/src/main/java/convex/peer/ConnectionManager.java

@@ -235,9 +235,10 @@ private void tryRandomConnect(State s) throws InterruptedException {
 
 		if (target!=null) {
 			// Try to connect to Peer. If it fails, no worry, will retry another peer next time
-			boolean success=connectToPeer(target) != null;
-			if (!success) {
-				log.warn("Failed to connect to Peer at "+target);
+			try {
+				connectToPeer(target);
+			} catch (IOException|TimeoutException e) {
+				log.debug("Failed to connect to Peer at "+target,e);
 			}
 		}
 	}
@@ -581,10 +582,12 @@ private synchronized HashMap<AccountKey, Convex> getCurrentConnections() {
 	/**
 	 * Connects explicitly to a Peer at the given host address
 	 * @param hostAddress Address to connect to
-	 * @return new Connection, or null if attempt fails
+	 * @return new Convex connection, or null if attempt fails
 	 * @throws InterruptedException 
+	 * @throws TimeoutException 
+	 * @throws IOException 
 	 */
-	public Convex connectToPeer(InetSocketAddress hostAddress) throws InterruptedException {
+	public Convex connectToPeer(InetSocketAddress hostAddress) throws InterruptedException, IOException, TimeoutException {
 		try {
 			Convex convex=Convex.connect(hostAddress);
 			Result result = convex.requestStatusSync(Config.DEFAULT_CLIENT_TIMEOUT);
@@ -611,9 +614,6 @@ public Convex connectToPeer(InetSocketAddress hostAddress) throws InterruptedExc
 				addConnection(peerKey, convex);
 			}
 			return convex;
-		} catch (IOException | TimeoutException e) {
-			log.warn("Error connecting to peer: ",e);
-			return null;
 		} catch (UnresolvedAddressException e) {
 			log.info("Unable to resolve host address: "+hostAddress);
 			return null;