diff options
4 files changed, 58 insertions, 45 deletions
diff --git a/installation/dmaap-listener/src/main/properties/log4j.properties b/installation/dmaap-listener/src/main/properties/log4j.properties index 3e9e8964..d550f1bf 100644 --- a/installation/dmaap-listener/src/main/properties/log4j.properties +++ b/installation/dmaap-listener/src/main/properties/log4j.properties @@ -3,14 +3,14 @@ # openECOMP : SDN-C # ================================================================================ # Copyright (C) 2017 AT&T Intellectual Property. All rights -# reserved. +# 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. @@ -19,19 +19,32 @@ # ============LICENSE_END========================================================= ### -log4j.rootLogger=INFO,CONSOLE,LOGFILE +status = debug +dest = err +name = LogConfiguration +rootLogger.level = debug +appenders = logfile, console + +property.filename = /opt/onap/sdnc/dmaap-listener/logs/dmaap-listener.log +property.filePattern = /opt/onap/sdnc/dmaap-listener/logs/dmaap-listener-%i.log # CONSOLE is set to be a ConsoleAppender using a PatternLayout. -log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender -log4j.appender.CONSOLE.Threshold=ERROR -log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout -log4j.appender.CONSOLE.layout.ConversionPattern=%p %d{yyyy-MM-dd HH:mm:ss.SSS Z} %c{1} - %m%n +appender.console.type = Console +appender.console.name = STDOUT +appender.console.filter.threshold.type = ThresholdFilter +appender.console.filter.threshold.level = error +appender.console.layout.type = PatternLayout +appender.console.layout.pattern = %p %d{yyyy-MM-dd HH:mm:ss.SSS Z} %c{1} - %m%n # LOGFILE is set to be a File appender using a PatternLayout. -log4j.appender.LOGFILE=org.apache.log4j.RollingFileAppender -log4j.appender.LOGFILE.File=/opt/onap/sdnc/dmaap-listener/logs/dmaap-listener.log -log4j.appender.LOGFILE.Append=true -log4j.appender.LOGFILE.layout=org.apache.log4j.PatternLayout -log4j.appender.LOGFILE.layout.ConversionPattern=%p %d{yyyy-MM-dd HH:mm:ss.SSS Z} %c{1} - %m%n -log4j.appender.LOGFILE.MaxFileSize=10MB -log4j.appender.LOGFILE.MaxBackupIndex=10 +appender.logfile.type = RollingFile +appender.logfile.name = RollingFile +appender.logfile.fileName = ${filename} +appender.logfile.filePattern = ${filePattern} +appender.logfile.layout.type = PatternLayout +appender.logfile.layout.pattern = %p %d{yyyy-MM-dd HH:mm:ss.SSS Z} %c{1} - %m%n +appender.logfile.policies.type = Policies +appender.logfile.policies.size.type = SizeBasedTriggeringPolicy +appender.logfile.policies.size.size = 10MB +appender.logfile.strategy.type = DefaultRolloverStrategy +appender.logfile.strategy.max = 10 diff --git a/installation/dmaap-listener/src/main/scripts/start-dmaap-listener.sh b/installation/dmaap-listener/src/main/scripts/start-dmaap-listener.sh index 6a8eb13d..e606585f 100644 --- a/installation/dmaap-listener/src/main/scripts/start-dmaap-listener.sh +++ b/installation/dmaap-listener/src/main/scripts/start-dmaap-listener.sh @@ -31,13 +31,7 @@ JAVA_HOME=${JAVA_HOME:-/usr/lib/jvm/java-7-oracle} JAVA_OPTS=${JAVA_OPTS:--Dhttps.protocols=TLSv1.1,TLSv1.2} JAVA=${JAVA:-${JAVA_HOME}/bin/java} -# Redirect output from script to $LISTENER.out -if [ ! -d ${DMAAPLISTENERROOT}/logs ] -then - mkdir ${DMAAPLISTENERROOT}/logs -fi -exec >> ${DMAAPLISTENERROOT}/logs/$LISTENER.out -exec 2>&1 + for file in ${DMAAPLISTENERROOT}/lib/*.jar do @@ -45,7 +39,7 @@ do done echo "Starting dmaap-listener" -exec ${JAVA} ${JAVA_OPTS} -Dlog4j.configuration=file:${PROPERTY_DIR}/log4j.properties -jar ${DMAAPLISTENERROOT}/lib/dmaap-listener*.jar dmaap-listener.properties -cp ${LISTENERCLASSPATH} +exec ${JAVA} ${JAVA_OPTS} -Dlog4j.configurationFile=${PROPERTY_DIR}/log4j.properties -jar ${DMAAPLISTENERROOT}/lib/dmaap-listener*.jar dmaap-listener.properties -cp ${LISTENERCLASSPATH} diff --git a/installation/ueb-listener/src/main/properties/log4j.properties b/installation/ueb-listener/src/main/properties/log4j.properties index d556b659..bc88c491 100644 --- a/installation/ueb-listener/src/main/properties/log4j.properties +++ b/installation/ueb-listener/src/main/properties/log4j.properties @@ -3,7 +3,7 @@ # openECOMP : SDN-C # ================================================================================ # Copyright (C) 2017 AT&T Intellectual Property. All rights -# reserved. +# reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -19,19 +19,32 @@ # ============LICENSE_END========================================================= ### -log4j.rootLogger=INFO,CONSOLE,LOGFILE +status = debug +dest = err +name = LogConfiguration +rootLogger.level = debug +appenders = logfile, console + +property.filename = /opt/onap/sdnc/ueb-listener/logs/ueb-listener.log +property.filePattern = /opt/onap/sdnc/ueb-listener/logs/ueb-listener-%i.log # CONSOLE is set to be a ConsoleAppender using a PatternLayout. -log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender -log4j.appender.CONSOLE.Threshold=ERROR -log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout -log4j.appender.CONSOLE.layout.ConversionPattern=%p %d{yyyy-MM-dd HH:mm:ss.SSS Z} %c{1} - %m%n +appender.console.type = Console +appender.console.name = STDOUT +appender.console.filter.threshold.type = ThresholdFilter +appender.console.filter.threshold.level = error +appender.console.layout.type = PatternLayout +appender.console.layout.pattern = %p %d{yyyy-MM-dd HH:mm:ss.SSS Z} %c{1} - %m%n # LOGFILE is set to be a File appender using a PatternLayout. -log4j.appender.LOGFILE=org.apache.log4j.RollingFileAppender -log4j.appender.LOGFILE.File=/opt/onap/sdnc/ueb-listener/logs/ueb-listener.log -log4j.appender.LOGFILE.Append=true -log4j.appender.LOGFILE.layout=org.apache.log4j.PatternLayout -log4j.appender.LOGFILE.layout.ConversionPattern=%p %d{yyyy-MM-dd HH:mm:ss.SSS Z} %c{1} - %m%n -log4j.appender.LOGFILE.MaxFileSize=10MB -log4j.appender.LOGFILE.MaxBackupIndex=10 +appender.logfile.type = RollingFile +appender.logfile.name = RollingFile +appender.logfile.fileName = ${filename} +appender.logfile.filePattern = ${filePattern} +appender.logfile.layout.type = PatternLayout +appender.logfile.layout.pattern = %p %d{yyyy-MM-dd HH:mm:ss.SSS Z} %c{1} - %m%n +appender.logfile.policies.type = Policies +appender.logfile.policies.size.type = SizeBasedTriggeringPolicy +appender.logfile.policies.size.size = 10MB +appender.logfile.strategy.type = DefaultRolloverStrategy +appender.logfile.strategy.max = 10
\ No newline at end of file diff --git a/installation/ueb-listener/src/main/scripts/start-ueb-listener.sh b/installation/ueb-listener/src/main/scripts/start-ueb-listener.sh index 65e33dce..6a317c62 100644 --- a/installation/ueb-listener/src/main/scripts/start-ueb-listener.sh +++ b/installation/ueb-listener/src/main/scripts/start-ueb-listener.sh @@ -1,4 +1,4 @@ -#!/bin/bash +\\#!/bin/bash ### # ============LICENSE_START======================================================= @@ -31,13 +31,6 @@ JAVA_HOME=${JAVA_HOME:-/usr/lib/jvm/java-7-oracle} JAVA_OPTS=${JAVA_OPTS:--Dhttps.protocols=TLSv1.1,TLSv1.2} JAVA=${JAVA:-${JAVA_HOME}/bin/java} -# Redirect output from script to $LISTENER.out -if [ ! -d ${UEBLISTENERROOT}/logs ] -then - mkdir ${UEBLISTENERROOT}/logs -fi -exec >> ${UEBLISTENERROOT}/logs/$LISTENER.out -exec 2>&1 for file in ${UEBLISTENERROOT}/lib/*.jar do @@ -45,7 +38,7 @@ do done echo "Starting ueb-listener" -exec ${JAVA} ${JAVA_OPTS} -jar ${UEBLISTENERROOT}/lib/ueb-listener*.jar -Dlog4j.configuration=file:${PROPERTY_DIR}/log4j.properties -cp ${LISTENERCLASSPATH} +exec ${JAVA} ${JAVA_OPTS} -jar ${UEBLISTENERROOT}/lib/ueb-listener*.jar -Dlog4j.configurationFile=${PROPERTY_DIR}/log4j.properties -cp ${LISTENERCLASSPATH} |