diff options
Diffstat (limited to 'installation')
6 files changed, 58 insertions, 102 deletions
diff --git a/installation/dmaap-listener/src/main/properties/log4j.properties b/installation/dmaap-listener/src/main/properties/log4j.properties deleted file mode 100644 index d550f1bf..00000000 --- a/installation/dmaap-listener/src/main/properties/log4j.properties +++ /dev/null @@ -1,50 +0,0 @@ -### -# ============LICENSE_START======================================================= -# openECOMP : SDN-C -# ================================================================================ -# Copyright (C) 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========================================================= -### - -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. -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. -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/properties/log4j2.xml b/installation/dmaap-listener/src/main/properties/log4j2.xml new file mode 100644 index 00000000..01ee9371 --- /dev/null +++ b/installation/dmaap-listener/src/main/properties/log4j2.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<Configuration status="debug"> + <Properties> + <Property name="logDir">$${env:LOGDIR:-logs}</Property> + </Properties> + <Appenders> + <RollingFile name="LOGFILE" fileName="${logDir}/dmaap-listener.log" + filePattern="${logDir}/dmaap-listener-%i.log"> + <PatternLayout pattern="%p %d{yyyy-MM-dd HH:mm:ss.SSS Z} %c{1} - %m%n" /> + <Policies> + <SizeBasedTriggeringPolicy size="10 MB" /> + </Policies> + <DefaultRolloverStrategy max="10"/> + </RollingFile> + <Console name="CONSOLE" target="SYSTEM_OUT"> + <PatternLayout pattern="%p %d{yyyy-MM-dd HH:mm:ss.SSS Z} %c{1} - %m%n" /> + </Console> + </Appenders> + <Loggers> + <Root level="debug"> + <AppenderRef ref="LOGFILE"/> + <AppenderRef ref="CONSOLE"/> + </Root> + </Loggers> +</Configuration>
\ No newline at end of file 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 e606585f..ab3b7392 100644 --- a/installation/dmaap-listener/src/main/scripts/start-dmaap-listener.sh +++ b/installation/dmaap-listener/src/main/scripts/start-dmaap-listener.sh @@ -27,6 +27,7 @@ PROPERTY_DIR=${PROPERTY_DIR:-/opt/onap/sdnc/data/properties} LISTENER=dmaap-listener DMAAPLISTENERROOT=${DMAAPLISTENERROOT:-/opt/onap/sdnc/dmaap-listener} +LOGDIR=${LOGDIR:-${DMAAPLISTENERROOT}/logs} 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} @@ -39,7 +40,8 @@ do done echo "Starting dmaap-listener" -exec ${JAVA} ${JAVA_OPTS} -Dlog4j.configurationFile=${PROPERTY_DIR}/log4j.properties -jar ${DMAAPLISTENERROOT}/lib/dmaap-listener*.jar dmaap-listener.properties -cp ${LISTENERCLASSPATH} +cd ${DMAAPLISTENERROOT} +exec ${JAVA} ${JAVA_OPTS} -Dlog4j.configurationFile=${PROPERTY_DIR}/log4j2.xml -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 deleted file mode 100644 index 0d252988..00000000 --- a/installation/ueb-listener/src/main/properties/log4j.properties +++ /dev/null @@ -1,50 +0,0 @@ -### -# ============LICENSE_START======================================================= -# openECOMP : SDN-C -# ================================================================================ -# Copyright (C) 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========================================================= -### - -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. -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. -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/ueb-listener/src/main/properties/log4j2.xml b/installation/ueb-listener/src/main/properties/log4j2.xml new file mode 100644 index 00000000..23ab908a --- /dev/null +++ b/installation/ueb-listener/src/main/properties/log4j2.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<Configuration status="debug"> + <Properties> + <Property name="logDir">$${env:LOGDIR:-logs}</Property> + </Properties> + <Appenders> + <RollingFile name="LOGFILE" fileName="${logDir}/ueb-listener.log" + filePattern="${logDir}/ueb-listener-%i.log"> + <PatternLayout pattern="%p %d{yyyy-MM-dd HH:mm:ss.SSS Z} %c{1} - %m%n" /> + <Policies> + <SizeBasedTriggeringPolicy size="10 MB" /> + </Policies> + <DefaultRolloverStrategy max="10"/> + </RollingFile> + <Console name="CONSOLE" target="SYSTEM_OUT"> + <PatternLayout pattern="%p %d{yyyy-MM-dd HH:mm:ss.SSS Z} %c{1} - %m%n" /> + </Console> + </Appenders> + <Loggers> + <Root level="debug"> + <AppenderRef ref="LOGFILE"/> + <AppenderRef ref="CONSOLE"/> + </Root> + </Loggers> +</Configuration>
\ 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 33793fb0..773e228c 100644 --- a/installation/ueb-listener/src/main/scripts/start-ueb-listener.sh +++ b/installation/ueb-listener/src/main/scripts/start-ueb-listener.sh @@ -27,6 +27,7 @@ PROPERTY_DIR=${PROPERTY_DIR:-/opt/onap/sdnc/data/properties} LISTENER=ueb-listener UEBLISTENERROOT=${UEBLISTENERROOT:-/opt/onap/sdnc/ueb-listener} +LOGDIR=${LOGDIR:-${UEBLISTENERROOT}/logs} 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} @@ -38,7 +39,8 @@ do done echo "Starting ueb-listener" -exec ${JAVA} ${JAVA_OPTS} -jar ${UEBLISTENERROOT}/lib/ueb-listener*.jar -Dlog4j.configurationFile=${PROPERTY_DIR}/log4j.properties -cp ${LISTENERCLASSPATH} +cd ${UEBLISTENERROOT} +exec ${JAVA} ${JAVA_OPTS} -jar ${UEBLISTENERROOT}/lib/ueb-listener*.jar -Dlog4j.configurationFile=${PROPERTY_DIR}/log4j2.xml -cp ${LISTENERCLASSPATH} |