metric log updates and util fix

[logging-analytics.git] / reference / logging-filter / logging-filter-base / src / main / java / org / onap / logging / filter / base / AbstractAuditLogFilter.java

diff --git a/reference/logging-filter/logging-filter-base/src/main/java/org/onap/logging/filter/base/AbstractAuditLogFilter.java b/reference/logging-filter/logging-filter-base/src/main/java/org/onap/logging/filter/base/AbstractAuditLogFilter.java
index 00285b6..d8394a7 100644 (file)
--- a/reference/logging-filter/logging-filter-base/src/main/java/org/onap/logging/filter/base/AbstractAuditLogFilter.java
+++ b/reference/logging-filter/logging-filter-base/src/main/java/org/onap/logging/filter/base/AbstractAuditLogFilter.java
@@ -44,7 +44,7 @@ public abstract class AbstractAuditLogFilter<GenericRequest, GenericResponse> ex
             additionalPreHandling(request);
             setLogTimestamp();
             setElapsedTime();
-            logger.info(ONAPLogConstants.Markers.ENTRY, "Entering");
+            logEntering();
         } catch (Exception e) {
             logger.warn("Error in AbstractInboundFilter pre", e);
         }
@@ -59,8 +59,8 @@ public abstract class AbstractAuditLogFilter<GenericRequest, GenericResponse> ex
             setResponseDescription(responseCode);
             setLogTimestamp();
             setElapsedTime();
-            logger.info(ONAPLogConstants.Markers.EXIT, "Exiting.");
             additionalPostHandling(response);
+            logExiting();
         } catch (Exception e) {
             logger.warn("Error in AbstractInboundFilter post", e);
         } finally {
@@ -80,4 +80,12 @@ public abstract class AbstractAuditLogFilter<GenericRequest, GenericResponse> ex
         // override to add additional post handling
     }
 
+    protected void logEntering() {
+        logger.info(ONAPLogConstants.Markers.ENTRY, "Entering");
+    }
+
+    protected void logExiting() {
+        logger.info(ONAPLogConstants.Markers.EXIT, "Exiting.");
+    }
+
 }