From eeed2ae14fceb21c9518a0056b2a29039b69f092 Mon Sep 17 00:00:00 2001 From: Instrumental Date: Wed, 13 Jun 2018 17:19:07 -0500 Subject: Adjust Logging Dir settings for ONAP Users Issue-ID: AAF-360 Change-Id: If19090ef482372d3a3a9aa2856762af91bc54017 Signed-off-by: Instrumental --- .../main/java/org/onap/aaf/misc/env/log4j/LogFileNamer.java | 7 +++---- .../org/onap/aaf/misc/env/log4j/JU_LogFileNamerTest.java | 13 +++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'misc') 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 a98ba7c0..c6537deb 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 @@ -59,15 +59,14 @@ public class LogFileNamer { * @throws IOException */ public String setAppender(String appender) throws IOException { - String filename; int i = 0; File f; - while ((f = new File(filename = String.format(FILE_FORMAT_STR, dir, root, appender, ending, i))).exists()) { + while ((f = new File(String.format(FILE_FORMAT_STR, dir, root, appender, ending, i))).exists()) { ++i; } - ; + f.createNewFile(); - System.setProperty("LOG4J_FILENAME_" + appender, filename); + System.setProperty("LOG4J_FILENAME_" + appender, f.getCanonicalPath()); return appender; } diff --git a/misc/log4j/src/test/java/org/onap/aaf/misc/env/log4j/JU_LogFileNamerTest.java b/misc/log4j/src/test/java/org/onap/aaf/misc/env/log4j/JU_LogFileNamerTest.java index 0ee79a5f..b96d6dd0 100644 --- a/misc/log4j/src/test/java/org/onap/aaf/misc/env/log4j/JU_LogFileNamerTest.java +++ b/misc/log4j/src/test/java/org/onap/aaf/misc/env/log4j/JU_LogFileNamerTest.java @@ -34,6 +34,7 @@ import org.junit.Before; import org.junit.Test; public class JU_LogFileNamerTest { + private File dir = new File("."); private String ending = new SimpleDateFormat("YYYYMMdd").format(new Date()); @@ -43,26 +44,26 @@ public class JU_LogFileNamerTest { @Test public void test() throws IOException { - LogFileNamer logFileNamer = new LogFileNamer(".", "log"); + LogFileNamer logFileNamer = new LogFileNamer(dir.getCanonicalPath(), "log"); assertEquals(logFileNamer, logFileNamer.noPID()); logFileNamer.setAppender("Append"); - assertEquals(System.getProperty("LOG4J_FILENAME_Append"), "./log-Append" + ending + "_0.log"); + assertEquals(System.getProperty("LOG4J_FILENAME_Append"), dir.getCanonicalFile()+"/log-Append" + ending + "_0.log"); logFileNamer.setAppender("Append"); - assertEquals(System.getProperty("LOG4J_FILENAME_Append"), "./log-Append" + ending + "_1.log"); + assertEquals(System.getProperty("LOG4J_FILENAME_Append"), dir.getCanonicalFile()+"/log-Append" + ending + "_1.log"); } @Test public void testBlankRoot() throws IOException { - LogFileNamer logFileNamer = new LogFileNamer(".", ""); + LogFileNamer logFileNamer = new LogFileNamer(dir.getCanonicalPath(), ""); assertEquals(logFileNamer, logFileNamer.noPID()); logFileNamer.setAppender("Append"); - assertEquals(System.getProperty("LOG4J_FILENAME_Append"), "./Append" + ending + "_0.log"); + assertEquals(System.getProperty("LOG4J_FILENAME_Append"), dir.getCanonicalPath()+"/Append" + ending + "_0.log"); logFileNamer.setAppender("Append"); - assertEquals(System.getProperty("LOG4J_FILENAME_Append"), "./Append" + ending + "_1.log"); + assertEquals(System.getProperty("LOG4J_FILENAME_Append"), dir.getCanonicalPath()+"/Append" + ending + "_1.log"); } @After -- cgit 1.2.3-korg