Configuration Agent and MS for AAF

[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 e295c86..3fb250f 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
@@ -50,7 +50,7 @@ public class Log4JLogIt implements LogIt {
 
 
        public Log4JLogIt(final String[] args, final String root) throws APIException {
-               String propsFile = getArgOrVM(AAF_LOG4J_PREFIX, args, "org.osaaf")+".log4j.props";
+               String propsFile = getArgOrVM(AAF_LOG4J_PREFIX, args, "org.osaaf.aaf")+".log4j.props";
                String log_dir = getArgOrVM(Config.CADI_LOGDIR,args,"/opt/app/osaaf/logs");
                String etc_dir = getArgOrVM(Config.CADI_ETCDIR,args,"/opt/app/osaaf/etc");
                String log_level = getArgOrVM(Config.CADI_LOGLEVEL,args,"INFO");
@@ -62,6 +62,9 @@ public class Log4JLogIt implements LogIt {
                        logs.mkdirs();
                }
 
+               if(System.getProperty("log4j.configuration")==null) {
+                       System.setProperty("log4j.configuration", etc_dir+'/'+propsFile);
+               }
                LogFileNamer lfn = new LogFileNamer(log_dir,root);
                try {
                        service=lfn.setAppender("service"); // when name is split, i.e. authz|service, the Appender is "authz", and "service"