Remove logging from elasticsearch-nio jar

libs/elasticsearch-nio/build.gradle

@@ -33,8 +33,6 @@ publishing {
 }
 
 dependencies {
-  compile "org.apache.logging.log4j:log4j-api:${versions.log4j}"
-
   testCompile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
   testCompile "junit:junit:${versions.junit}"
   testCompile "org.hamcrest:hamcrest-all:${versions.hamcrest}"
@@ -64,18 +62,3 @@ forbiddenApisMain {
   // es-all is not checked as we connect and accept sockets
   signaturesURLs = [PrecommitTasks.getResource('/forbidden/jdk-signatures.txt')]
 }
-
-//JarHell is part of es core, which we don't want to pull in
-jarHell.enabled=false
-
-thirdPartyAudit.excludes = [
-        'org/osgi/framework/AdaptPermission',
-        'org/osgi/framework/AdminPermission',
-        'org/osgi/framework/Bundle',
-        'org/osgi/framework/BundleActivator',
-        'org/osgi/framework/BundleContext',
-        'org/osgi/framework/BundleEvent',
-        'org/osgi/framework/SynchronousBundleListener',
-        'org/osgi/framework/wiring/BundleWire',
-        'org/osgi/framework/wiring/BundleWiring'
-]

libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/AcceptorEventHandler.java

@@ -19,11 +19,9 @@
 
 package org.elasticsearch.nio;
 
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.message.ParameterizedMessage;
-
 import java.io.IOException;
 import java.nio.channels.SelectionKey;
+import java.util.function.Consumer;
 import java.util.function.Supplier;
 
 /**
@@ -33,8 +31,8 @@ public class AcceptorEventHandler extends EventHandler {
 
     private final Supplier<SocketSelector> selectorSupplier;
 
-    public AcceptorEventHandler(Logger logger, Supplier<SocketSelector> selectorSupplier) {
-        super(logger);
+    public AcceptorEventHandler(Supplier<SocketSelector> selectorSupplier, Consumer<Exception> exceptionHandler) {
+        super(exceptionHandler);
         this.selectorSupplier = selectorSupplier;
     }
 
@@ -58,7 +56,7 @@ protected void handleRegistration(ServerChannelContext context) throws IOExcepti
      * @param exception that occurred
      */
     protected void registrationException(ServerChannelContext context, Exception exception) {
-        logger.error(new ParameterizedMessage("failed to register server channel: {}", context.getChannel()), exception);
+        context.handleException(exception);
     }
 
     /**
@@ -78,7 +76,6 @@ protected void acceptChannel(ServerChannelContext context) throws IOException {
      * @param exception that occurred
      */
     protected void acceptException(ServerChannelContext context, Exception exception) {
-        logger.debug(() -> new ParameterizedMessage("exception while accepting new channel from server channel: {}",
-            context.getChannel()), exception);
+        context.handleException(exception);
     }
 }

libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/ESSelector.java

@@ -83,7 +83,7 @@ public void runLoop() {
                     try {
                         selector.close();
                     } catch (IOException e) {
-                        eventHandler.closeSelectorException(e);
+                        eventHandler.selectorException(e);
                     } finally {
                         runLock.unlock();
                         exitedLoop.countDown();
@@ -123,7 +123,7 @@ void singleLoop() {
                 throw e;
             }
         } catch (IOException e) {
-            eventHandler.selectException(e);
+            eventHandler.selectorException(e);
         } catch (Exception e) {
             eventHandler.uncaughtException(e);
         }

libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/EventHandler.java

@@ -19,37 +19,26 @@
 
 package org.elasticsearch.nio;
 
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.message.ParameterizedMessage;
-
 import java.io.IOException;
 import java.nio.channels.Selector;
+import java.util.function.Consumer;
 
 public abstract class EventHandler {
 
-    protected final Logger logger;
-
-    EventHandler(Logger logger) {
-        this.logger = logger;
-    }
+    protected final Consumer<Exception> exceptionHandler;
 
-    /**
-     * This method handles an IOException that was thrown during a call to {@link Selector#select(long)}.
-     *
-     * @param exception the exception
-     */
-    protected void selectException(IOException exception) {
-        logger.warn(new ParameterizedMessage("io exception during select [thread={}]", Thread.currentThread().getName()), exception);
+    protected EventHandler(Consumer<Exception> exceptionHandler) {
+        this.exceptionHandler = exceptionHandler;
     }
 
     /**
-     * This method handles an IOException that was thrown during a call to {@link Selector#close()}.
+     * This method handles an IOException that was thrown during a call to {@link Selector#select(long)} or
+     * {@link Selector#close()}.
      *
      * @param exception the exception
      */
-    protected void closeSelectorException(IOException exception) {
-        logger.warn(new ParameterizedMessage("io exception while closing selector [thread={}]", Thread.currentThread().getName()),
-            exception);
+    protected void selectorException(IOException exception) {
+        exceptionHandler.accept(exception);
     }
 
     /**
@@ -79,11 +68,11 @@ protected void handleClose(ChannelContext<?> context) {
     /**
      * This method is called when an attempt to close a channel throws an exception.
      *
-     * @param context that was being closed
+     * @param channel that was being closed
      * @param exception that occurred
      */
-    protected void closeException(ChannelContext<?> context, Exception exception) {
-        logger.debug(() -> new ParameterizedMessage("exception while closing channel: {}", context.getChannel()), exception);
+    protected void closeException(ChannelContext<?> channel, Exception exception) {
+        channel.handleException(exception);
     }
 
     /**
@@ -95,6 +84,6 @@ protected void closeException(ChannelContext<?> context, Exception exception) {
      * @param exception that was thrown
      */
     protected void genericChannelException(ChannelContext<?> channel, Exception exception) {
-        logger.debug(() -> new ParameterizedMessage("exception while handling event for channel: {}", channel.getChannel()), exception);
+        channel.handleException(exception);
     }
 }