X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=datarouter-prov%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdatarouter%2Fprovisioning%2Futils%2FDRProvCadiFilter.java;h=46cfabec9768c5757f23000ead49c8aaa559ce3e;hb=refs%2Fchanges%2F51%2F78851%2F11;hp=688a32f6ce3034fc5a1dfa125257488b71e6cedb;hpb=0fa019897cb79de1def349b8fd0b660d1951681a;p=dmaap%2Fdatarouter.git diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/DRProvCadiFilter.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/DRProvCadiFilter.java index 688a32f6..46cfabec 100644 --- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/DRProvCadiFilter.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/DRProvCadiFilter.java @@ -20,7 +20,8 @@ */ package org.onap.dmaap.datarouter.provisioning.utils; -import org.apache.log4j.Logger; +import com.att.eelf.configuration.EELFLogger; +import com.att.eelf.configuration.EELFManager; import org.onap.aaf.cadi.PropAccess; import org.onap.aaf.cadi.filter.CadiFilter; import org.onap.dmaap.datarouter.provisioning.BaseServlet; @@ -38,8 +39,8 @@ import java.io.IOException; public class DRProvCadiFilter extends CadiFilter { - private static Logger eventlogger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.events"); - private static Logger intlogger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal"); + protected static EELFLogger eventlogger = EELFManager.getInstance().getLogger("EventLog"); + protected static EELFLogger intlogger = EELFManager.getInstance().getLogger("InternalLog"); private String aafInstance = ""; public DRProvCadiFilter(boolean init, PropAccess access) throws ServletException { @@ -71,21 +72,21 @@ public class DRProvCadiFilter extends CadiFilter { String message = String.format("Invalid request URI - %s", httpRequest.getPathInfo()); elr.setMessage(message); elr.setResult(HttpServletResponse.SC_NOT_FOUND); - eventlogger.info(elr); + eventlogger.error(elr.toString()); httpResponse.sendError(HttpServletResponse.SC_NOT_FOUND, message); return; } if (isAAFSubscriber(subId)) {//edit AAF Subscriber String message = String.format("DRProvCadiFilter - Edit AAF Subscriber : %d : AAF Instance - %s", subId, aafInstance); elr.setMessage(message); - eventlogger.info(elr); + eventlogger.info(elr.toString()); //request.setAttribute("aafInstance", aafInstance);// no need to set it in request since it is taken care in respective servlets super.doFilter(request, response, chain); } else {//Edit or publish legacy Subscriber String message = "DRProvCadiFilter - Edit/Publish Legacy Subscriber :" + subId; elr.setMessage(message); - eventlogger.info(elr); + eventlogger.info(elr.toString()); chain.doFilter(request, response); } @@ -95,7 +96,7 @@ public class DRProvCadiFilter extends CadiFilter { String message = "Invalid request URI - " + httpRequest.getPathInfo(); elr.setMessage(message); elr.setResult(HttpServletResponse.SC_NOT_FOUND); - eventlogger.info(elr); + eventlogger.error(elr.toString()); httpResponse.sendError(HttpServletResponse.SC_NOT_FOUND, message); return; } @@ -103,20 +104,20 @@ public class DRProvCadiFilter extends CadiFilter { if (isAAFFeed(feedId)) {//edit AAF Feed String message = "DRProvCadiFilter - Edit AAF Feed:" + feedId + ":" + "AAF Instance -" + aafInstance; elr.setMessage(message); - eventlogger.info(elr); + eventlogger.info(elr.toString()); super.doFilter(request, response, chain); } else {//Edit or publish legacy Feed String message = "DRProvCadiFilter - Edit/Publish Legacy Feed:" + feedId; elr.setMessage(message); - eventlogger.info(elr); + eventlogger.info(elr.toString()); chain.doFilter(request, response); } } } else {// in all other cases defaults to legacy behavior String message = "DRProvCadiFilter - Default Legacy Feed/Subscriber URI -:" + httpRequest.getPathInfo(); elr.setMessage(message); - eventlogger.info(elr); + eventlogger.info(elr.toString()); chain.doFilter(request, response); } } else { @@ -127,7 +128,7 @@ public class DRProvCadiFilter extends CadiFilter { String message = "Invalid request URI - " + httpRequest.getPathInfo(); elr.setMessage(message); elr.setResult(HttpServletResponse.SC_NOT_FOUND); - eventlogger.info(elr); + eventlogger.error(elr.toString()); httpResponse.sendError(HttpServletResponse.SC_NOT_FOUND, message); return; } @@ -136,25 +137,25 @@ public class DRProvCadiFilter extends CadiFilter { String message = "DRProvCadiFilter -Invalid request Header Parmeter " + BaseServlet.EXCLUDE_AAF_HEADER + " = " + httpRequest.getHeader(BaseServlet.EXCLUDE_AAF_HEADER); elr.setMessage(message); elr.setResult(HttpServletResponse.SC_BAD_REQUEST); - eventlogger.info(elr); + eventlogger.error(elr.toString()); httpResponse.sendError(HttpServletResponse.SC_BAD_REQUEST, message); return; } if (excludeAAF.equalsIgnoreCase("true")) {//Check to add legacy subscriber to AAF Feed String message = "DRProvCadiFilter - add legacy subscriber to AAF Feed, FeedID:" + feedId; elr.setMessage(message); - eventlogger.info(elr); + eventlogger.info(elr.toString()); chain.doFilter(request, response); } else { String message = "DRProvCadiFilter - Add AAF subscriber to AAF Feed, FeedID:" + feedId + ":" + "AAF Instance -" + aafInstance; elr.setMessage(message); - eventlogger.info(elr); + eventlogger.info(elr.toString()); super.doFilter(request, response, chain); } } else {//Add legacy susbcriber to legacy Feed String message = "DRProvCadiFilter - add legacy subscriber to legacy Feed:" + feedId; elr.setMessage(message); - eventlogger.info(elr); + eventlogger.info(elr.toString()); chain.doFilter(request, response); } } else {//add AAF feed @@ -162,19 +163,19 @@ public class DRProvCadiFilter extends CadiFilter { String message = "DRProvCadiFilter -Invalid request Header Parmeter " + BaseServlet.EXCLUDE_AAF_HEADER + " = " + httpRequest.getHeader(BaseServlet.EXCLUDE_AAF_HEADER); elr.setMessage(message); elr.setResult(HttpServletResponse.SC_BAD_REQUEST); - eventlogger.info(elr); + eventlogger.error(elr.toString()); httpResponse.sendError(HttpServletResponse.SC_BAD_REQUEST, message); return; } if (excludeAAF.equalsIgnoreCase("true")) {//add legacy feed String message = "DRProvCadiFilter - Create new legacy Feed : EXCLUDE_AAF = " + excludeAAF; elr.setMessage(message); - eventlogger.info(elr); + eventlogger.info(elr.toString()); chain.doFilter(request, response); } else {//add AAF Feed String message = "DRProvCadiFilter - Create new AAF Feed : EXCLUDE_AAF = " + excludeAAF; elr.setMessage(message); - eventlogger.info(elr); + eventlogger.info(elr.toString()); super.doFilter(request, response, chain); } } @@ -210,7 +211,7 @@ public class DRProvCadiFilter extends CadiFilter { } } catch (Exception e) { - intlogger.error("PROV0073 DRProvCadiFilter.isAAFFeed: ", e); + intlogger.error("PROV0073 DRProvCadiFilter.isAAFFeed: ", e.getMessage()); return false; } return false; @@ -240,7 +241,7 @@ public class DRProvCadiFilter extends CadiFilter { intlogger.debug(message); } } catch (Exception e) { - intlogger.error("PROV0073 DRProvCadiFilter.isAAFSubscriber: ", e); + intlogger.error("PROV0073 DRProvCadiFilter.isAAFSubscriber: ", e.getMessage()); return false; } return false;