X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=datarouter-node%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdatarouter%2Fnode%2FNodeMain.java;h=b8c06f14b35fab89522a7389f34806debada5f85;hb=1979daeb2b383b6a7bccda7c2f5dd7fe4bca612a;hp=8aaa577c371afb3417e5179132c05e7cde578c2c;hpb=441eae1b3d617a5b78df37865874f166e3491f8d;p=dmaap%2Fdatarouter.git

diff --git a/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeMain.java b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeMain.java
index 8aaa577c..b8c06f14 100644
--- a/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeMain.java
+++ b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeMain.java
@@ -23,13 +23,19 @@
 
 package org.onap.dmaap.datarouter.node;
 
-import org.eclipse.jetty.http.HttpVersion;
-import org.eclipse.jetty.servlet.*;
-import org.eclipse.jetty.util.ssl.*;
-import org.eclipse.jetty.server.*;
-import org.apache.log4j.Logger;
-
 import java.util.Arrays;
+import org.apache.log4j.Logger;
+import org.eclipse.jetty.http.HttpVersion;
+import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.HttpConfiguration;
+import org.eclipse.jetty.server.HttpConnectionFactory;
+import org.eclipse.jetty.server.SecureRequestCustomizer;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
+import org.eclipse.jetty.server.SslConnectionFactory;
+import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.util.ssl.SslContextFactory;
 
 /**
  * The main starting point for the Data Router node
@@ -39,7 +45,7 @@ public class NodeMain {
     private NodeMain() {
     }
 
-    private static Logger LOGGER = Logger.getLogger("org.onap.dmaap.datarouter.node.NodeMain");
+    private static Logger nodeMainLogger = Logger.getLogger("org.onap.dmaap.datarouter.node.NodeMain");
 
     private static class WaitForConfig implements Runnable {
 
@@ -56,15 +62,17 @@ public class NodeMain {
         synchronized void waitForConfig() {
             localNodeConfigManager.registerConfigTask(this);
             while (!localNodeConfigManager.isConfigured()) {
-                LOGGER.info("NODE0003 Waiting for Node Configuration");
+                nodeMainLogger.info("NODE0003 Waiting for Node Configuration");
                 try {
                     wait();
-                } catch (Exception e) {
-                    LOGGER.debug("NodeMain: waitForConfig exception. Exception Message:- " +e.getMessage());
+                } catch (Exception exception) {
+                    nodeMainLogger
+                        .debug("NodeMain: waitForConfig exception. Exception Message:- " + exception.toString(),
+                            exception);
                 }
             }
             localNodeConfigManager.deregisterConfigTask(this);
-            LOGGER.info("NODE0004 Node Configuration Data Received");
+            nodeMainLogger.info("NODE0004 Node Configuration Data Received");
         }
     }
 
@@ -85,16 +93,15 @@ public class NodeMain {
      * property.  By default, it is "etc/node.properties".
      */
     public static void main(String[] args) throws Exception {
-        LOGGER.info("NODE0001 Data Router Node Starting");
+        nodeMainLogger.info("NODE0001 Data Router Node Starting");
         IsFrom.setDNSCache();
         nodeConfigManager = NodeConfigManager.getInstance();
-        LOGGER.info("NODE0002 I am " + nodeConfigManager.getMyName());
+        nodeMainLogger.info("NODE0002 I am " + nodeConfigManager.getMyName());
         (new WaitForConfig(nodeConfigManager)).waitForConfig();
         delivery = new Delivery(nodeConfigManager);
         Server server = new Server();
         // HTTP configuration
         HttpConfiguration httpConfiguration = new HttpConfiguration();
-        httpConfiguration.setIdleTimeout(2000);
         httpConfiguration.setRequestHeaderSize(2048);
 
         // HTTP connector
@@ -102,6 +109,7 @@ public class NodeMain {
         try (ServerConnector httpServerConnector = new ServerConnector(server,
             new HttpConnectionFactory(httpConfiguration))) {
             httpServerConnector.setPort(nodeConfigManager.getHttpPort());
+            httpServerConnector.setIdleTimeout(2000);
 
             // HTTPS configuration
             SslContextFactory sslContextFactory = new SslContextFactory();
@@ -111,7 +119,7 @@ public class NodeMain {
             sslContextFactory.setKeyManagerPassword(nodeConfigManager.getKPass());
             /* Skip SSLv3 Fixes */
             sslContextFactory.addExcludeProtocols("SSLv3");
-            LOGGER.info("Excluded protocols node-" + Arrays.toString(sslContextFactory.getExcludeProtocols()));
+            nodeMainLogger.info("Excluded protocols node-" + Arrays.toString(sslContextFactory.getExcludeProtocols()));
             /* End of SSLv3 Fixes */
 
             HttpConfiguration httpsConfiguration = new HttpConfiguration(httpConfiguration);
@@ -123,20 +131,21 @@ public class NodeMain {
             httpsConfiguration.addCustomizer(secureRequestCustomizer);
 
             // HTTPS connector
-            ServerConnector httpsServerConnector = new ServerConnector(server,
+            try (ServerConnector httpsServerConnector = new ServerConnector(server,
                 new SslConnectionFactory(sslContextFactory, HttpVersion.HTTP_1_1.asString()),
-                new HttpConnectionFactory(httpsConfiguration));
-            httpsServerConnector.setPort(nodeConfigManager.getHttpsPort());
-            httpsServerConnector.setIdleTimeout(500000);
-            httpsServerConnector.setAcceptQueueSize(2);
+                new HttpConnectionFactory(httpsConfiguration))) {
+                httpsServerConnector.setPort(nodeConfigManager.getHttpsPort());
+                httpsServerConnector.setIdleTimeout(500000);
+                httpsServerConnector.setAcceptQueueSize(2);
 
-            server.setConnectors(new Connector[]{httpServerConnector, httpsServerConnector});
+                server.setConnectors(new Connector[]{httpServerConnector, httpsServerConnector});
+            }
         }
         ctxt = new ServletContextHandler(0);
         ctxt.setContextPath("/");
         server.setHandler(ctxt);
         ctxt.addServlet(new ServletHolder(new NodeServlet()), "/*");
-        LOGGER.info("NODE0005 Data Router Node Activating Service");
+        nodeMainLogger.info("NODE0005 Data Router Node Activating Service");
         server.start();
         server.join();
     }