X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=misc%2Flog4j%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fmisc%2Fenv%2Flog4j%2FLogFileNamer.java;h=e118baaaefd04ed0e687bbcf98ef439d14ee41a6;hb=refs%2Fchanges%2F75%2F65275%2F1;hp=c6537deb7c321626b5bea838a56f9155cc65f85c;hpb=eeed2ae14fceb21c9518a0056b2a29039b69f092;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 c6537deb..e118baaa 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 @@ -27,61 +27,61 @@ import java.text.SimpleDateFormat; import java.util.Date; public class LogFileNamer { - private final String root; - private final String ending; - private final String dir; + private final String root; + private final String ending; + private final String dir; - public LogFileNamer(final String dir, final String root) { - this.dir = dir; - if (root == null || "".equals(root) || root.endsWith("/")) { - this.root = root; - } else { - this.root = root + "-"; - } - ending = new SimpleDateFormat("YYYYMMdd").format(new Date()); - } + public LogFileNamer(final String dir, final String root) { + this.dir = dir; + if (root == null || "".equals(root) || root.endsWith("/")) { + this.root = root; + } else { + this.root = root + "-"; + } + ending = new SimpleDateFormat("YYYYMMdd").format(new Date()); + } - public LogFileNamer noPID() { - return this; - } + public LogFileNamer noPID() { + return this; + } - private static final String FILE_FORMAT_STR = "%s/%s%s%s_%d.log"; + private static final String FILE_FORMAT_STR = "%s/%s%s%s_%d.log"; - /** - * Accepts a String. If Separated by "|" then first part is the Appender name, - * and the second is used in the FileNaming (This is to allow for shortened - * Logger names, and more verbose file names) ONAP: jna code has license issues. - * Just do Date + Unique Number - * - * @param appender - * - * returns the String Appender - * @throws IOException - */ - public String setAppender(String appender) throws IOException { - int i = 0; - File f; - while ((f = new File(String.format(FILE_FORMAT_STR, dir, root, appender, ending, i))).exists()) { - ++i; - } - - f.createNewFile(); - System.setProperty("LOG4J_FILENAME_" + appender, f.getCanonicalPath()); - return appender; - } + /** + * Accepts a String. If Separated by "|" then first part is the Appender name, + * and the second is used in the FileNaming (This is to allow for shortened + * Logger names, and more verbose file names) ONAP: jna code has license issues. + * Just do Date + Unique Number + * + * @param appender + * + * returns the String Appender + * @throws IOException + */ + public String setAppender(String appender) throws IOException { + int i = 0; + File f; + while ((f = new File(String.format(FILE_FORMAT_STR, dir, root, appender, ending, i))).exists()) { + ++i; + } + + f.createNewFile(); + System.setProperty("LOG4J_FILENAME_" + appender, f.getCanonicalPath()); + return appender; + } - 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(fname); - if (rsrc == null) { - String msg = "Neither File: " + path + '/' + fname + " nor resource on Classpath " + fname + " exist"; - throw new IOException(msg); - } - org.apache.log4j.PropertyConfigurator.configure(rsrc); - } + 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(fname); + if (rsrc == null) { + String msg = "Neither File: " + path + '/' + fname + " nor resource on Classpath " + fname + " exist"; + throw new IOException(msg); + } + org.apache.log4j.PropertyConfigurator.configure(rsrc); + } - } + } }