Updates for DirectLocator

[aaf/authz.git] / auth / auth-core / src / main / java / org / onap / aaf / auth / server / Log4JLogIt.java

diff --git a/auth/auth-core/src/main/java/org/onap/aaf/auth/server/Log4JLogIt.java b/auth/auth-core/src/main/java/org/onap/aaf/auth/server/Log4JLogIt.java
index 31b7639..894f571 100644 (file)
--- a/auth/auth-core/src/main/java/org/onap/aaf/auth/server/Log4JLogIt.java
+++ b/auth/auth-core/src/main/java/org/onap/aaf/auth/server/Log4JLogIt.java
@@ -22,7 +22,6 @@ package org.onap.aaf.auth.server;
 
 import java.io.File;
 import java.io.IOException;
-import java.text.SimpleDateFormat;
 
 import org.apache.log4j.Logger;
 import org.onap.aaf.cadi.Access.Level;
@@ -31,12 +30,11 @@ import org.onap.aaf.cadi.PropAccess.LogIt;
 import org.onap.aaf.cadi.config.Config;
 import org.onap.aaf.misc.env.APIException;
 import org.onap.aaf.misc.env.log4j.LogFileNamer;
+import org.onap.aaf.misc.env.util.Chrono;
 
 public class Log4JLogIt implements LogIt {
     protected static final String AAF_LOG4J_PREFIX = "aaf_log4j_prefix";
-
-    // Sonar says cannot be static... it's ok.  not too many PropAccesses created.
-    private final SimpleDateFormat iso8601 = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ");
+    // Log4j does it's own date.  Can't apparently turn it off.
     
     private final String service;
     private final String audit;
@@ -55,14 +53,14 @@ public class Log4JLogIt implements LogIt {
         String etc_dir = getArgOrVM(Config.CADI_ETCDIR,args,"/opt/app/osaaf/etc");
         String log_level = getArgOrVM(Config.CADI_LOGLEVEL,args,"INFO");
         File logs = new File(log_dir);
-        if(!logs.isDirectory()) {
+        if (!logs.isDirectory()) {
             logs.delete();
         }
-        if(!logs.exists()) {
+        if (!logs.exists()) {
             logs.mkdirs();
         }
 
-        if(System.getProperty("log4j.configuration")==null) {
+        if (System.getProperty("log4j.configuration")==null) {
             System.setProperty("log4j.configuration", etc_dir+'/'+propsFile);
         }
         LogFileNamer lfn = new LogFileNamer(log_dir,root);
@@ -86,14 +84,14 @@ public class Log4JLogIt implements LogIt {
     private static final String getArgOrVM(final String tag, final String args[], final String def) {
         String tagEQ = tag + '=';
         String value;
-        for(String arg : args) {
-            if(arg.startsWith(tagEQ)) {
+        for (String arg : args) {
+            if (arg.startsWith(tagEQ)) {
                 return arg.substring(tagEQ.length());
             }
         }
         // check System.properties
         value = System.getProperty(tag);
-        if(value!=null) { 
+        if (value!=null) { 
             return value;
         }
         
@@ -104,30 +102,30 @@ public class Log4JLogIt implements LogIt {
     public void push(Level level, Object... elements) {
         switch(level) {
             case AUDIT:
-                laudit.warn(PropAccess.buildMsg(audit, iso8601, level, elements));
+                laudit.warn(PropAccess.buildMsg(audit, Chrono.utcFmt, level, elements));
                 break;
             case INIT:
-                linit.warn(PropAccess.buildMsg(init, iso8601, level, elements));
+                linit.warn(PropAccess.buildMsg(init, Chrono.utcFmt, level, elements));
                 break;
             case ERROR:
-                lservice.error(PropAccess.buildMsg(service, iso8601, level, elements));
+                lservice.error(PropAccess.buildMsg(service, Chrono.utcFmt, level, elements));
                 break;
             case WARN:
-                lservice.warn(PropAccess.buildMsg(service, iso8601, level, elements));
+                lservice.warn(PropAccess.buildMsg(service, Chrono.utcFmt, level, elements));
                 break;
             case INFO:
-                lservice.info(PropAccess.buildMsg(service, iso8601, level, elements));
+                lservice.info(PropAccess.buildMsg(service, Chrono.utcFmt, level, elements));
                 break;
             case DEBUG:
-                lservice.debug(PropAccess.buildMsg(service, iso8601, level, elements));
+                lservice.debug(PropAccess.buildMsg(service, Chrono.utcFmt, level, elements));
                 break;
             case TRACE:
-                ltrace.trace(PropAccess.buildMsg(service, iso8601, level, elements));
+                ltrace.trace(PropAccess.buildMsg(service, Chrono.utcFmt, level, elements));
                 break;
             case NONE:
                 break;
             default:
-                lservice.info(PropAccess.buildMsg(service, iso8601, level, elements));
+                lservice.info(PropAccess.buildMsg(service, Chrono.utcFmt, level, elements));
                 break;
         
         }