aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeMain.java18
-rw-r--r--datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeUtils.java32
-rw-r--r--datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/LogServlet.java20
3 files changed, 36 insertions, 34 deletions
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..006dc88c 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
@@ -39,7 +39,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 +56,15 @@ 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,10 +85,10 @@ 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();
@@ -111,7 +111,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);
@@ -136,7 +136,7 @@ public class NodeMain {
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();
}
diff --git a/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeUtils.java b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeUtils.java
index ea2ce34b..230afd4c 100644
--- a/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeUtils.java
+++ b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeUtils.java
@@ -47,13 +47,13 @@ import com.att.eelf.configuration.EELFManager;
* Utility functions for the data router node
*/
public class NodeUtils {
- private static EELFLogger EELFLOGGER = EELFManager.getInstance().getLogger("org.onap.dmaap.datarouter.node.NodeUtils");
- private static Logger LOGGER = Logger.getLogger("org.onap.dmaap.datarouter.node.NodeUtils");
- private static SimpleDateFormat LOGDATE;
+ private static EELFLogger eelfLogger = EELFManager.getInstance().getLogger("org.onap.dmaap.datarouter.node.NodeUtils");
+ private static Logger nodeUtilsLogger = Logger.getLogger("org.onap.dmaap.datarouter.node.NodeUtils");
+ private static SimpleDateFormat logDate;
static {
- LOGDATE = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
- LOGDATE.setTimeZone(TimeZone.getTimeZone("GMT"));
+ logDate = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
+ logDate.setTimeZone(TimeZone.getTimeZone("GMT"));
}
private NodeUtils() {
@@ -95,8 +95,8 @@ public class NodeUtils {
md.update(node.getBytes());
md.update(key.getBytes());
return (getAuthHdr(node, base64Encode(md.digest())));
- } catch (Exception e) {
- LOGGER.error("Exception in generating Credentials for given node name:= " + e.getMessage());
+ } catch (Exception exception) {
+ nodeUtilsLogger.error("Exception in generating Credentials for given node name:= " + exception.toString(), exception);
return (null);
}
}
@@ -117,12 +117,12 @@ public class NodeUtils {
ks.load(fileInputStream, kspass.toCharArray());
}
} catch(IOException ioException) {
- LOGGER.error("Exception occurred while opening FileInputStream",ioException);
+ nodeUtilsLogger.error("Exception occurred while opening FileInputStream",ioException);
return (null);
} catch (Exception e) {
setIpAndFqdnForEelf("getCanonicalName");
- EELFLOGGER.error(EelfMsgs.MESSAGE_KEYSTORE_LOAD_ERROR, ksfile, e.toString());
- LOGGER.error("NODE0401 Error loading my keystore file + " + ksfile + " " + e.toString(), e);
+ eelfLogger.error(EelfMsgs.MESSAGE_KEYSTORE_LOAD_ERROR, ksfile, e.toString());
+ nodeUtilsLogger.error("NODE0401 Error loading my keystore file + " + ksfile + " " + e.toString(), e);
return (null);
}
return (getCanonicalName(ks));
@@ -157,7 +157,7 @@ public class NodeUtils {
}
}
} catch (Exception e) {
- LOGGER.error("NODE0402 Error extracting my name from my keystore file " + e.toString(), e);
+ nodeUtilsLogger.error("NODE0402 Error extracting my name from my keystore file " + e.toString(), e);
}
return (null);
}
@@ -171,8 +171,8 @@ public class NodeUtils {
public static byte[] getInetAddress(String ip) {
try {
return (InetAddress.getByName(ip).getAddress());
- } catch (Exception e) {
- LOGGER.error("Exception in generating byte array for given IP address := " + e.getMessage());
+ } catch (Exception exception) {
+ nodeUtilsLogger.error("Exception in generating byte array for given IP address := " + exception.toString(), exception);
}
return (null);
}
@@ -232,7 +232,7 @@ public class NodeUtils {
* Format a logging timestamp as yyyy-mm-ddThh:mm:ss.mmmZ
*/
public static synchronized String logts(Date when) {
- return (LOGDATE.format(when));
+ return (logDate.format(when));
}
/* Method prints method name, server FQDN and IP Address of the machine in EELF logs
@@ -245,8 +245,8 @@ public class NodeUtils {
try {
MDC.put(MDC_SERVER_FQDN, InetAddress.getLocalHost().getHostName());
MDC.put(MDC_SERVER_IP_ADDRESS, InetAddress.getLocalHost().getHostAddress());
- } catch (Exception e) {
- LOGGER.error("Exception in generating byte array for given IP address := " + e.getMessage());
+ } catch (Exception exception) {
+ nodeUtilsLogger.error("Exception in generating byte array for given IP address := " + exception.toString(), exception);
}
}
diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/LogServlet.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/LogServlet.java
index 48a23921..8614a6e8 100644
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/LogServlet.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/LogServlet.java
@@ -39,6 +39,7 @@ import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.log4j.Logger;
import org.onap.dmaap.datarouter.provisioning.beans.DeliveryRecord;
import org.onap.dmaap.datarouter.provisioning.beans.EventLogRecord;
import org.onap.dmaap.datarouter.provisioning.beans.ExpiryRecord;
@@ -63,17 +64,16 @@ import com.att.eelf.configuration.EELFManager;
public class LogServlet extends BaseServlet {
//Adding EELF Logger Rally:US664892
private static EELFLogger eelflogger = EELFManager.getInstance().getLogger("org.onap.dmaap.datarouter.provisioning.LogServlet");
-
private static final long TWENTYFOUR_HOURS = (24 * 60 * 60 * 1000L);
private static final String fmt1 = "yyyy-MM-dd'T'HH:mm:ss'Z'";
private static final String fmt2 = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";
- private boolean isfeedlog;
+ private static boolean isfeedlog;
public abstract class RowHandler {
private final ServletOutputStream out;
private final String[] fields;
- public boolean firstrow;
+ private boolean firstrow;
public RowHandler(ServletOutputStream out, String fieldparam, boolean b) {
this.out = out;
@@ -98,8 +98,8 @@ public class LogServlet extends BaseServlet {
t += jo.toString();
out.print(t);
firstrow = false;
- } catch (Exception e) {
- // ignore
+ } catch (Exception exception) {
+ intlogger.info("Failed to handle row. Exception = " + exception.getMessage(),exception);
}
}
public abstract LOGJSONable buildJSONable(ResultSet rs) throws SQLException;
@@ -345,13 +345,15 @@ public class LogServlet extends BaseServlet {
SimpleDateFormat sdf = new SimpleDateFormat(fmt);
Date d = sdf.parse(s);
return d.getTime();
- } catch (ParseException e) {
+ } catch (ParseException parseException) {
+ intlogger.error("Exception in getting Time :- "+parseException.getMessage(),parseException);
}
try {
// Also allow a long (in ms); useful for testing
long n = Long.parseLong(s);
return n;
- } catch (NumberFormatException e) {
+ } catch (NumberFormatException numberFormatException) {
+ intlogger.error("Exception in getting Time :- "+numberFormatException.getMessage(),numberFormatException);
}
intlogger.info("Error parsing time="+s);
return -1;
@@ -422,8 +424,8 @@ public class LogServlet extends BaseServlet {
}
rs.close();
stmt.close();
- } catch (SQLException e) {
- e.printStackTrace();
+ } catch (SQLException sqlException) {
+ intlogger.info("Failed to get Records. Exception = " +sqlException.getMessage(),sqlException);
} finally {
if (conn != null)
db.release(conn);