X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fbabel%2Flogging%2FLogHelper.java;h=19ee25b86f80e579c4ef041301c9ff43f327ef2b;hb=156df4c60543946ae392047fd169ba5a0c21a502;hp=b9fa35132aa67e627af67c0675fb5aecdf15fb76;hpb=4864816a2bfdb7e3b0afa0320d0b7695d74b30e8;p=aai%2Fbabel.git diff --git a/src/main/java/org/onap/aai/babel/logging/LogHelper.java b/src/main/java/org/onap/aai/babel/logging/LogHelper.java index b9fa351..19ee25b 100644 --- a/src/main/java/org/onap/aai/babel/logging/LogHelper.java +++ b/src/main/java/org/onap/aai/babel/logging/LogHelper.java @@ -22,11 +22,6 @@ package org.onap.aai.babel.logging; import static com.att.eelf.configuration.Configuration.MDC_SERVICE_NAME; -import ch.qos.logback.classic.AsyncAppender; -import ch.qos.logback.core.FileAppender; -import com.att.eelf.configuration.EELFLogger; -import com.att.eelf.configuration.EELFManager; -import com.att.eelf.i18n.EELFResolvableErrorEnum; import java.io.File; import java.text.DateFormat; import java.text.SimpleDateFormat; @@ -34,9 +29,11 @@ import java.util.Date; import java.util.Optional; import java.util.function.BiConsumer; import java.util.function.Consumer; + import javax.servlet.ServletRequest; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response.Status; + import org.apache.commons.lang3.time.StopWatch; import org.onap.aai.babel.request.RequestHeaders; import org.onap.aai.cl.api.LogFields; @@ -46,6 +43,13 @@ import org.onap.aai.cl.mdc.MdcOverride; import org.onap.aai.restclient.client.Headers; import org.slf4j.MDC; +import com.att.eelf.configuration.EELFLogger; +import com.att.eelf.configuration.EELFManager; +import com.att.eelf.i18n.EELFResolvableErrorEnum; + +import ch.qos.logback.classic.AsyncAppender; +import ch.qos.logback.core.FileAppender; + /*- * This Log Helper mimics the interface of a Common Logging Logger * but adds helper methods for audit and metrics logging requirements. @@ -119,10 +123,10 @@ public enum LogHelper implements Logger { /** Our externally advertised service API */ private static final String SERVICE_NAME_VALUE = "AAI-BAS"; - private static final EELFLogger errorLogger = EELFManager.getInstance().getErrorLogger(); - private static final EELFLogger debugLogger = EELFManager.getInstance().getDebugLogger(); - private static final EELFLogger auditLogger = EELFManager.getInstance().getAuditLogger(); - private static final EELFLogger metricsLogger = EELFManager.getInstance().getMetricsLogger(); + private static final EELFLogger errorLogger = EELFManager.getErrorLogger(); + private static final EELFLogger debugLogger = EELFManager.getDebugLogger(); + private static final EELFLogger auditLogger = EELFManager.getAuditLogger(); + private static final EELFLogger metricsLogger = EELFManager.getMetricsLogger(); /** Formatting for timestamps logged as Strings (from the MDC) */ private DateFormat timestampFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX");