diff options
Diffstat (limited to 'src/main')
5 files changed, 60 insertions, 52 deletions
diff --git a/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/MirrorMakerAgent.java b/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/MirrorMakerAgent.java index 9af3809..f47adfb 100644 --- a/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/MirrorMakerAgent.java +++ b/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/MirrorMakerAgent.java @@ -21,6 +21,8 @@ *******************************************************************************/ package org.onap.dmaap.mr.dmaapMMAgent; +import com.google.gson.Gson; +import com.google.gson.internal.LinkedTreeMap; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -29,8 +31,8 @@ import java.io.InputStream; import java.io.OutputStream; import java.util.ArrayList; import java.util.Properties; - -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.jasypt.util.text.BasicTextEncryptor; import org.json.JSONObject; import org.onap.dmaap.mr.dmaapMMAgent.dao.CreateMirrorMaker; @@ -41,11 +43,8 @@ import org.onap.dmaap.mr.dmaapMMAgent.dao.UpdateMirrorMaker; import org.onap.dmaap.mr.dmaapMMAgent.dao.UpdateWhiteList; import org.onap.dmaap.mr.dmaapMMAgent.utils.MirrorMakerProcessHandler; -import com.google.gson.Gson; -import com.google.gson.internal.LinkedTreeMap; - public class MirrorMakerAgent { - static final Logger logger = Logger.getLogger(MirrorMakerAgent.class); + private static final Logger logger = LogManager.getLogger(MirrorMakerAgent.class); Properties mirrorMakerProperties = new Properties(); ListMirrorMaker mirrorMakers = null; String mmagenthome = "/opt"; diff --git a/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/TopicUtil.java b/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/TopicUtil.java index e2dc0ef..85a6bcd 100644 --- a/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/TopicUtil.java +++ b/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/TopicUtil.java @@ -22,21 +22,20 @@ package org.onap.dmaap.mr.dmaapMMAgent; +import com.google.gson.Gson; +import com.sun.org.apache.xerces.internal.impl.dv.util.Base64; import java.io.BufferedReader; import java.io.DataOutputStream; import java.io.InputStream; import java.io.InputStreamReader; import java.net.HttpURLConnection; import java.net.URL; - -import org.apache.log4j.Logger; - -import com.google.gson.Gson; -import com.sun.org.apache.xerces.internal.impl.dv.util.Base64; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class TopicUtil { - static final Logger logger = Logger.getLogger(TopicUtil.class); + private static final Logger logger = LogManager.getLogger(TopicUtil.class); public String publishTopic(String topicURL, String topicname, String mechid, String password, String message) { try { diff --git a/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/utils/MirrorMakerProcessHandler.java b/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/utils/MirrorMakerProcessHandler.java index 883d151..625fbc8 100644 --- a/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/utils/MirrorMakerProcessHandler.java +++ b/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/utils/MirrorMakerProcessHandler.java @@ -24,11 +24,11 @@ package org.onap.dmaap.mr.dmaapMMAgent.utils; import java.io.BufferedReader; import java.io.InputStream; import java.io.InputStreamReader; - -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class MirrorMakerProcessHandler { - static final Logger logger = Logger.getLogger(MirrorMakerProcessHandler.class); + private static final Logger logger = LogManager.getLogger(MirrorMakerProcessHandler.class); static String mmagenthome = "/opt"; public static boolean checkMirrorMakerProcess(String agentname, boolean enablelogCheck, String grepLog) throws Exception { diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties deleted file mode 100644 index 9225695..0000000 --- a/src/main/resources/log4j.properties +++ /dev/null @@ -1,37 +0,0 @@ -############################################################################### -# ============LICENSE_START======================================================= -# org.onap.dmaap -# ================================================================================ -# Copyright © 2017 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========================================================= -# -# ECOMP is a trademark and service mark of AT&T Intellectual Property. -# -############################################################################### -# Root logger option -log4j.rootLogger=INFO, stdout, file - -# Redirect log messages to console -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.Target=System.out -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p - %m %n - -# Redirect log messages to a log file, support file rolling. -log4j.appender.file=org.apache.log4j.RollingFileAppender -log4j.appender.file.File= /opt/logs/mmagent.log -log4j.appender.file.MaxFileSize=5MB -log4j.appender.file.MaxBackupIndex=10 -log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p - %m %n
\ No newline at end of file diff --git a/src/main/resources/log4j2.properties b/src/main/resources/log4j2.properties new file mode 100644 index 0000000..9432e1d --- /dev/null +++ b/src/main/resources/log4j2.properties @@ -0,0 +1,47 @@ +### +# ============LICENSE_START======================================================= +# Copyright (C) 2021 Nordix Foundation. +# ================================================================================ +# 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. +# +# SPDX-License-Identifier: Apache-2.0 +# ============LICENSE_END========================================================= +### + +# Log4j2 PropertiesConfig +status = info +name = PropertiesConfig + +# Console Appender +appender.console.type = Console +appender.console.name = STDOUT +appender.console.layout.type = PatternLayout +appender.console.layout.pattern = %d{yyyy-MM-dd HH:mm:ss} %-5p - %m %n + +# Rolling Appender +appender.rolling.type = RollingFile +appender.rolling.name = rollingFile +appender.rolling.fileName = /opt/logs/mmagent.log +appender.rolling.filePattern = /opt/logs/$${date:yyyy-MM-dd}/mmagent-%d{yyyy-MM-dd}-%i.log +appender.rolling.layout.type = PatternLayout +appender.rolling.layout.pattern = %d{yyyy-MM-dd HH:mm:ss} %-5p - %m %n +appender.rolling.policies.type = Policies +appender.rolling.policies.size.type = SizeBasedTriggeringPolicy +appender.rolling.policies.size.size=5MB +appender.rolling.strategy.type = DefaultRolloverStrategy +appender.rolling.strategy.max = 10 + +# Root Logger +rootLogger.level = info +rootLogger.appenderRef.stdout.ref = STDOUT +rootLogger.appenderRef.rolling.ref = rollingFile
\ No newline at end of file |