Update for more Logging Info

Issue-ID: AAF-853
Change-Id: I51e9160e2b53ebf74ba5f93c9a634a790f7ed848
Signed-off-by: Instrumental <jonathan.gathman@att.com>

1 files changed, 10 insertions, 4 deletions

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 9a615fb8..85aae6f0 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
@@ -57,14 +57,20 @@ public class LogFileNamer {
      */

     public String setAppender(String appender) throws IOException {

     	File f = new File(String.format(FIRST_FILE_FORMAT_STR, dir, root, appender));

+    	File lock = new File(f.getAbsoluteFile()+".lock");

     	if(f.exists()) {

-	        int i = 0;

-	        while ((f = new File(String.format(FILE_FORMAT_STR, dir, root, appender, i))).exists()) {

-	            ++i;

-	        }

+    		if(lock.exists()) {

+		        int i = 0;

+		        while ((f = new File(String.format(FILE_FORMAT_STR, dir, root, appender, i))).exists() &&

+		        	   (lock = new File(f.getAbsoluteFile()+".lock")).exists()) {

+		            ++i;

+		        }

+    		}

     	}

         

         try {

+        	lock.createNewFile();

+        	lock.deleteOnExit();

         	f.createNewFile();

         } catch (IOException e) {

         	throw new IOException("Cannot create file '" + f.getCanonicalPath() + '\'', e);