X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=misc%2Flog4j%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fmisc%2Fenv%2Flog4j%2FLogFileNamer.java;h=cc4c8a96f8427c7285b4af63e94e11df731ab5fe;hb=924b18d7469204ceaae60d7345712ea09f75a674;hp=ff7b43f04a0e3c6376b2c7af9ea06eaf9ab8420b;hpb=33e7b1a9fa15b0b699d16e359b406195b7fe87be;p=aaf%2Fauthz.git

diff --git a/misc/log4j/src/main/java/org/onap/aaf/misc/env/log4j/LogFileNamer.java b/misc/log4j/src/main/java/org/onap/aaf/misc/env/log4j/LogFileNamer.java
index ff7b43f0..cc4c8a96 100644
--- a/misc/log4j/src/main/java/org/onap/aaf/misc/env/log4j/LogFileNamer.java
+++ b/misc/log4j/src/main/java/org/onap/aaf/misc/env/log4j/LogFileNamer.java
@@ -67,19 +67,19 @@ public class LogFileNamer {
 		};
 		f.createNewFile();
 		System.setProperty(
-			"LOG4J_FILENAME_"+(appender),
+			"LOG4J_FILENAME_"+appender,
 			filename);
 		return appender;
 	}
 
-	public void configure(final String props, final String log_level) throws IOException {
-		String fname;
-		if(new File(fname="etc/"+props).exists()) {
-			org.apache.log4j.PropertyConfigurator.configureAndWatch(fname,60*1000L);
+	public void configure(final String path, final String fname, final String log_level) throws IOException {
+		final String fullPath=path+'/'+fname;
+		if(new File(fullPath).exists()) {
+			org.apache.log4j.PropertyConfigurator.configureAndWatch(fullPath,60*1000L);
 		} else {
-			URL rsrc = ClassLoader.getSystemResource(props);
+			URL rsrc = ClassLoader.getSystemResource(fname);
 			if(rsrc==null) {
-				String msg = "Neither File: " + fname + " or resource on Classpath " + props + " exist" ;
+				String msg = "Neither File: " + path + '/' + fname + " nor resource on Classpath " + fname + " exist" ;
 				throw new IOException(msg);
 			}
 			org.apache.log4j.PropertyConfigurator.configure(rsrc);