Remove sneaky netty catch

Depending on bootstrap config the bind exception type may vary.
neo4j · Sep 28, 2018 · d8401e0 · d8401e0
1 parent f28a269
commit d8401e0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/net/Server.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/net/Server.java
@@ -29,7 +29,6 @@
 import io.netty.channel.EventLoopGroup;
 import io.netty.channel.socket.ServerSocketChannel;
 
-import java.net.BindException;
 import java.util.concurrent.TimeUnit;
 
 import org.neo4j.causalclustering.helper.SuspendableLifeCycle;
@@ -115,17 +114,14 @@ protected void start0()
         try
         {
             channel = bootstrap.bind().syncUninterruptibly().channel();
-            debugLog.info( "%s: bound to '%s' with transport '%s'", serverName, listenAddress, bootstrapConfiguration.channelClass() );
+            debugLog.info( "%s: bound to '%s' with transport '%s'", serverName, listenAddress, bootstrapConfiguration.channelClass().getSimpleName() );
         }
         catch ( Exception e )
         {
-            //noinspection ConstantConditions netty sneaky throw
-            if ( e instanceof BindException )
-            {
-                String message = serverName + ": address is already bound: " + listenAddress;
-                userLog.error( message );
-                debugLog.error( message, e );
-            }
+            String message =
+                    format( "%s: cannot bind to '%s' with transport '%s'.", serverName, listenAddress, bootstrapConfiguration.channelClass().getSimpleName() );
+            userLog.error( message + " Message: " + e.getMessage() );
+            debugLog.error( message, e );
             throw e;
         }
     }

diff --git a/...stering/src/test/java/org/neo4j/causalclustering/catchup/storecopy/StoreCopyClientIT.java b/...stering/src/test/java/org/neo4j/causalclustering/catchup/storecopy/StoreCopyClientIT.java
@@ -327,7 +327,7 @@ public AdvertisedSocketAddress secondary()
         catch ( StoreCopyFailedException e )
         {
             assertableLogProvider.assertContainsExactlyOneMessageMatching(
-                    both( startsWith( "Connection refused:" ) ).and( containsString( "localhost/127.0.0.1:" + port ) ) );
+                    both( containsString( "Connection refused:" ) ).and( containsString( "localhost/127.0.0.1:" + port ) ) );
         }
     }
 

diff --git a/...ausal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/ConnectionInfoIT.java b/...ausal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/ConnectionInfoIT.java
@@ -75,8 +75,9 @@ public void testAddressAlreadyBoundMessage() throws Throwable
         {
             //expected.
         }
-        logProvider.assertContainsMessageContaining( "server-name: address is already bound: " );
-        userLogProvider.assertContainsMessageContaining( "server-name: address is already bound: " );
+        String expectedPartOfMessage = String.format( "server-name: cannot bind to '%s' with transport ", listenSocketAddress );
+        logProvider.assertContainsMessageContaining( expectedPartOfMessage );
+        userLogProvider.assertContainsMessageContaining( expectedPartOfMessage );
     }
 
     @SuppressWarnings( "SameParameterValue" )