diff options
| -rw-r--r-- | dmaap-listener/src/main/resources/log4j.properties | 37 | ||||
| -rw-r--r-- | dmaap-listener/src/main/resources/log4j2.xml | 26 | ||||
| -rwxr-xr-x | ueb-listener/pom.xml | 4 | ||||
| -rw-r--r-- | ueb-listener/src/main/resources/log4j.properties | 37 | ||||
| -rw-r--r-- | ueb-listener/src/main/resources/log4j2.xml | 26 |
5 files changed, 54 insertions, 76 deletions
diff --git a/dmaap-listener/src/main/resources/log4j.properties b/dmaap-listener/src/main/resources/log4j.properties deleted file mode 100644 index 8db00762..00000000 --- a/dmaap-listener/src/main/resources/log4j.properties +++ /dev/null @@ -1,37 +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========================================================= -### - -log4j.rootLogger=DEBUG,CONSOLE,LOGFILE - -# 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 - -# LOGFILE is set to be a File appender using a PatternLayout. -log4j.appender.LOGFILE=org.apache.log4j.RollingFileAppender -log4j.appender.LOGFILE.File=/opt/app/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 diff --git a/dmaap-listener/src/main/resources/log4j2.xml b/dmaap-listener/src/main/resources/log4j2.xml new file mode 100644 index 00000000..01ee9371 --- /dev/null +++ b/dmaap-listener/src/main/resources/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/ueb-listener/pom.xml b/ueb-listener/pom.xml index 42546fd7..1df9f35b 100755 --- a/ueb-listener/pom.xml +++ b/ueb-listener/pom.xml @@ -24,8 +24,8 @@ <SWM_VERSION>${project.version}-${build.number}</SWM_VERSION> <ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.version> <ccsdk.sli.northbound.version>${project.version}</ccsdk.sli.northbound.version> - <sdc.client.version>1.4.1-SNAPSHOT</sdc.client.version> - <sdc.tosca.version>1.6.5</sdc.tosca.version> + <sdc.client.version>1.4.1</sdc.client.version> + <sdc.tosca.version>1.6.5</sdc.tosca.version> </properties> <dependencyManagement> diff --git a/ueb-listener/src/main/resources/log4j.properties b/ueb-listener/src/main/resources/log4j.properties deleted file mode 100644 index f2f4ed26..00000000 --- a/ueb-listener/src/main/resources/log4j.properties +++ /dev/null @@ -1,37 +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========================================================= -### - -log4j.rootLogger=DEBUG,CONSOLE,LOGFILE - -# 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 - -# LOGFILE is set to be a File appender using a PatternLayout. -log4j.appender.LOGFILE=org.apache.log4j.RollingFileAppender -log4j.appender.LOGFILE.File=/opt/app/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 diff --git a/ueb-listener/src/main/resources/log4j2.xml b/ueb-listener/src/main/resources/log4j2.xml new file mode 100644 index 00000000..23ab908a --- /dev/null +++ b/ueb-listener/src/main/resources/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 |