diff options
author | 2018-04-02 17:41:10 -0500 | |
---|---|---|
committer | 2018-04-02 17:42:06 -0500 | |
commit | 67bac2c1c44beab7752b39584553449e1c8a4e94 (patch) | |
tree | 40f0023bc420e0cc947a1d81f235e04f8bf925f3 /misc/log4j/src/main/java/org/onap | |
parent | 1eb6678db673759f0f95b1aedfcb4fe55c7152a2 (diff) |
Keep only clean TestCases, remove 2 license issues
Issue-ID: AAF-111
Change-Id: I7f779f4beacc84427734ce2c5b0369d5727e136d
Signed-off-by: Instrumental <jcgmisc@stl.gathman.org>
Diffstat (limited to 'misc/log4j/src/main/java/org/onap')
-rw-r--r-- | misc/log4j/src/main/java/org/onap/aaf/misc/env/log4j/LogFileNamer.java | 8 | ||||
-rw-r--r-- | misc/log4j/src/main/java/org/onap/aaf/misc/env/log4j/PIDAccess.java | 30 |
2 files changed, 2 insertions, 36 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 f8c6611e..7174912f 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 @@ -25,9 +25,7 @@ import java.io.File; import java.net.URL; public class LogFileNamer { - public static final int pid = PIDAccess.INSTANCE.getpid(); public final String root; - private boolean printPID; public LogFileNamer(String root) { if(root==null || "".equals(root) || root.endsWith("/")) { @@ -35,11 +33,9 @@ public class LogFileNamer { } else { this.root = root + "-"; } - printPID=true; } public LogFileNamer noPID() { - printPID = false; return this; } /** @@ -57,12 +53,12 @@ public class LogFileNamer { String rv; System.setProperty( "LOG4J_FILENAME_"+(rv=appender.substring(0,pipe)), - root + appender.substring(pipe+1) + (printPID?('-' + pid):"") + ".log"); + root + appender.substring(pipe+1) + ".log"); return rv; } else { System.setProperty( "LOG4J_FILENAME_"+appender, - root + appender + (printPID?('-' + pid):"") + ".log"); + root + appender + ".log"); return appender; } diff --git a/misc/log4j/src/main/java/org/onap/aaf/misc/env/log4j/PIDAccess.java b/misc/log4j/src/main/java/org/onap/aaf/misc/env/log4j/PIDAccess.java deleted file mode 100644 index 6e23ce63..00000000 --- a/misc/log4j/src/main/java/org/onap/aaf/misc/env/log4j/PIDAccess.java +++ /dev/null @@ -1,30 +0,0 @@ -/** - * ============LICENSE_START==================================================== - * org.onap.aaf - * =========================================================================== - * Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. - * =========================================================================== - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END==================================================== - * - */ - -package org.onap.aaf.misc.env.log4j; - -import com.sun.jna.Library; -import com.sun.jna.Native; - -public interface PIDAccess extends Library { - PIDAccess INSTANCE = (PIDAccess) Native.loadLibrary("c", PIDAccess.class); - int getpid (); -} |