diff options
Diffstat (limited to 'deliveries')
| -rwxr-xr-x | deliveries/pom.xml | 180 | ||||
| -rwxr-xr-x | deliveries/src/main/docker/docker-files/conf.d/logback_template.xml | 13 | ||||
| -rw-r--r-- | deliveries/src/main/docker/docker-files/logging.properties | 71 |
3 files changed, 170 insertions, 94 deletions
diff --git a/deliveries/pom.xml b/deliveries/pom.xml index f096c2b62..48b588ec5 100755 --- a/deliveries/pom.xml +++ b/deliveries/pom.xml @@ -1,106 +1,104 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.onap.vid</groupId>
- <artifactId>vid-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.onap.vid</groupId>
+ <artifactId>vid-parent</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </parent>
- <packaging>pom</packaging>
- <groupId>org.onap.vid</groupId>
- <artifactId>vid-deliveries</artifactId>
+ <packaging>pom</packaging>
+ <artifactId>vid-deliveries</artifactId>
- <name>VID Deliveries</name>
- <description>ONAP VID Deliveries</description>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <docker.push.registry>${docker_registry}</docker.push.registry>
- <docker.verbose>true</docker.verbose>
- </properties>
+ <name>VID Deliveries</name>
+ <description>ONAP VID Deliveries</description>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <docker.push.registry>${docker_registry}</docker.push.registry>
+ <docker.verbose>true</docker.verbose>
+ </properties>
- <profiles>
+ <profiles>
- <profile>
- <id>docker-proxy</id>
- <!-- activate profile if environment variable `http_proxy` is set -->
- <activation>
- <property>
- <name>env.http_proxy</name>
- </property>
- </activation>
- <properties>
- <docker.buildArg.http_proxy>${env.http_proxy}</docker.buildArg.http_proxy>
- </properties>
- </profile>
+ <profile>
+ <id>docker-proxy</id>
+ <!-- activate profile if environment variable `http_proxy` is set -->
+ <activation>
+ <property>
+ <name>env.http_proxy</name>
+ </property>
+ </activation>
+ <properties>
+ <docker.buildArg.http_proxy>${env.http_proxy}</docker.buildArg.http_proxy>
+ </properties>
+ </profile>
- </profiles>
+ </profiles>
- <build>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <plugins>
- <plugin>
- <groupId>io.fabric8</groupId>
- <artifactId>docker-maven-plugin</artifactId>
- <version>0.16.5</version>
+ <build>
+ <finalName>${project.artifactId}-${project.version}</finalName>
+ <plugins>
+ <plugin>
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <version>0.16.5</version>
- <configuration>
- <verbose>true</verbose>
+ <configuration>
+ <verbose>true</verbose>
+ <apiVersion>1.23</apiVersion>
+ <images>
+ <image>
+ <name>onap/vid:${project.version}</name>
+ <build>
+ <cleanup>remove</cleanup>
+ <dockerFileDir>docker-files</dockerFileDir>
+ <assembly>
+ <basedir>/</basedir>
+ <user>vidadmin:vidadmin:vidadmin</user>
+ <descriptor>assembly/assembly-for-plugin.xml</descriptor>
+ </assembly>
+ <tags>
+ <tag>4.0-STAGING-latest</tag>
+ <tag>latest</tag>
+ </tags>
- <apiVersion>1.23</apiVersion>
- <images>
- <image>
- <name>onap/vid:${project.version}</name>
- <build>
- <cleanup>remove</cleanup>
- <dockerFileDir>docker-files</dockerFileDir>
- <assembly>
- <basedir>/</basedir>
- <user>vidadmin:vidadmin:vidadmin</user>
- <descriptor>assembly/assembly-for-plugin.xml</descriptor>
- </assembly>
- <tags>
- <tag>4.0-STAGING-latest</tag>
- <tag>latest</tag>
- </tags>
-
- </build>
- </image>
- </images>
- </configuration>
+ </build>
+ </image>
+ </images>
+ </configuration>
- <executions>
- <execution>
- <id>generate-image</id>
- <phase>package</phase>
- <goals>
- <goal>build</goal>
- </goals>
- </execution>
-
- <execution>
- <id>push-image</id>
- <phase>deploy</phase>
- <goals>
- <goal>build</goal>
- <goal>push</goal>
- </goals>
- </execution>
- </executions>
+ <executions>
+ <execution>
+ <id>generate-image</id>
+ <phase>package</phase>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ </execution>
- </plugin>
+ <execution>
+ <id>push-image</id>
+ <phase>deploy</phase>
+ <goals>
+ <goal>build</goal>
+ <goal>push</goal>
+ </goals>
+ </execution>
+ </executions>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.8</version>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>2.8</version>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/deliveries/src/main/docker/docker-files/conf.d/logback_template.xml b/deliveries/src/main/docker/docker-files/conf.d/logback_template.xml index bbc58cf2f..8d92ffebc 100755 --- a/deliveries/src/main/docker/docker-files/conf.d/logback_template.xml +++ b/deliveries/src/main/docker/docker-files/conf.d/logback_template.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<configuration scan="true" scanPeriod="3 seconds" debug="true"> +<configuration scan="true" scanPeriod="3 seconds"> <!-- specify the component name --> <property name="componentName" value="vid"></property> @@ -332,8 +332,15 @@ <logger name="com.att.eelf.debug" level="debug" additivity="false"> <appender-ref ref="asyncEELFDebug" /> </logger> - - + + <logger name="org.hibernate" level="WARN" additivity="false"> + <appender-ref ref="asyncEELF"/> + </logger> + + <logger name="org.hibernate.SQL" level="DEBUG" additivity="false"> + <appender-ref ref="asyncEELFDebug"/> + </logger> + <root level="${VID_LOG_LEVEL}"> <appender-ref ref="asyncEELF" /> </root> diff --git a/deliveries/src/main/docker/docker-files/logging.properties b/deliveries/src/main/docker/docker-files/logging.properties new file mode 100644 index 000000000..cab99b761 --- /dev/null +++ b/deliveries/src/main/docker/docker-files/logging.properties @@ -0,0 +1,71 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You 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. + +handlers = 1catalina.org.apache.juli.AsyncFileHandler, 2localhost.org.apache.juli.AsyncFileHandler, 3manager.org.apache.juli.AsyncFileHandler, 4host-manager.org.apache.juli.AsyncFileHandler, java.util.logging.ConsoleHandler + +.handlers = 1catalina.org.apache.juli.AsyncFileHandler, java.util.logging.ConsoleHandler + +############################################################ +# Handler specific properties. +# Describes specific configuration info for Handlers. +############################################################ + +1catalina.org.apache.juli.AsyncFileHandler.level = FINE +1catalina.org.apache.juli.AsyncFileHandler.directory = ${catalina.base}/logs +1catalina.org.apache.juli.AsyncFileHandler.prefix = catalina. + +2localhost.org.apache.juli.AsyncFileHandler.level = FINE +2localhost.org.apache.juli.AsyncFileHandler.directory = ${catalina.base}/logs +2localhost.org.apache.juli.AsyncFileHandler.prefix = localhost. + +3manager.org.apache.juli.AsyncFileHandler.level = FINE +3manager.org.apache.juli.AsyncFileHandler.directory = ${catalina.base}/logs +3manager.org.apache.juli.AsyncFileHandler.prefix = manager. + +4host-manager.org.apache.juli.AsyncFileHandler.level = FINE +4host-manager.org.apache.juli.AsyncFileHandler.directory = ${catalina.base}/logs +4host-manager.org.apache.juli.AsyncFileHandler.prefix = host-manager. + +java.util.logging.ConsoleHandler.level = FINE +java.util.logging.ConsoleHandler.formatter = org.apache.juli.OneLineFormatter + + +############################################################ +# Facility specific properties. +# Provides extra control for each logger. +############################################################ + +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = 2localhost.org.apache.juli.AsyncFileHandler + +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = INFO +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = 3manager.org.apache.juli.AsyncFileHandler + +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].level = INFO +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = 4host-manager.org.apache.juli.AsyncFileHandler + +# For example, set the org.apache.catalina.util.LifecycleBase logger to log +# each component that extends LifecycleBase changing state: +#org.apache.catalina.util.LifecycleBase.level = FINE + +# To see debug messages in TldLocationsCache, uncomment the following line: +#org.apache.jasper.compiler.TldLocationsCache.level = FINE + +# Log less important stuff to file only +org.apache.catalina.core.handlers = 1catalina.org.apache.juli.AsyncFileHandler +org.apache.catalina.startup.HostConfig.handlers = 1catalina.org.apache.juli.AsyncFileHandler +org.apache.coyote.handlers = 1catalina.org.apache.juli.AsyncFileHandler +org.apache.catalina.startup.VersionLoggerListener.handlers = 1catalina.org.apache.juli.AsyncFileHandler +org.apache.jasper.servlet.TldScanner.handlers = 1catalina.org.apache.juli.AsyncFileHandler
\ No newline at end of file |