diff options
Diffstat (limited to 'misc/log4j/src')
4 files changed, 2 insertions, 82 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 (); -} diff --git a/misc/log4j/src/test/java/org/onap/aaf/misc/env/log4j/LogTest.java b/misc/log4j/src/test/java/org/onap/aaf/misc/env/log4j/LogTest.java deleted file mode 100644 index d5c9062f..00000000 --- a/misc/log4j/src/test/java/org/onap/aaf/misc/env/log4j/LogTest.java +++ /dev/null @@ -1,45 +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 java.util.logging.Logger; - -import org.onap.aaf.misc.env.log4j.LogFileNamer; - - -public class LogTest -{ - public static void main(String[] args) throws Exception - { - LogFileNamer lfn = new LogFileNamer("authz"); - lfn.setAppender("service"); - lfn.setAppender("init"); - lfn.setAppender("audit"); - lfn.setAppender("test"); - lfn.configure("src/test/resources/log4j-test.properties"); - Logger log = Logger.getLogger( "init" ); - - - - log.info("Hello"); - } -} diff --git a/misc/log4j/src/test/resources/.gitignore b/misc/log4j/src/test/resources/.gitignore deleted file mode 100644 index 2079777e..00000000 --- a/misc/log4j/src/test/resources/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/log4j-test.properties |