diff options
Diffstat (limited to 'cps-ri')
| -rw-r--r-- | cps-ri/src/main/resources/logback-spring.xml | 48 | ||||
| -rw-r--r-- | cps-ri/src/test/java/org/onap/cps/DatabaseTestContainer.java | 6 |
2 files changed, 5 insertions, 49 deletions
diff --git a/cps-ri/src/main/resources/logback-spring.xml b/cps-ri/src/main/resources/logback-spring.xml deleted file mode 100644 index 8a4ae07c5..000000000 --- a/cps-ri/src/main/resources/logback-spring.xml +++ /dev/null @@ -1,48 +0,0 @@ -<configuration scan="true" debug="false"> - <include resource="org/springframework/boot/logging/logback/base.xml" /> - - <property name="queueSize" value="256" /> - <property name="maxFileSize" value="20MB" /> - <property name="maxHistory" value="30" /> - <property name="totalSizeCap" value="20MB" /> - - <!-- log file names --> - <property name="logName" value="cps" /> - - <property name="currentTimeStamp" value="%d{"yyyy-MM-dd'T'HH:mm:ss.SSSXXX",UTC}"/> - - <property name="debugPattern" - value="%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%thread|%X{RequestID}| %logger{50} - %msg%n" /> - - <appender name="Debug" - class="ch.qos.logback.core.rolling.RollingFileAppender"> - <file>../log/${logName}.log</file> - <rollingPolicy - class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy"> - <fileNamePattern>${logName}.%d{yyyy-MM-dd}.%i.log.zip - </fileNamePattern> - <maxFileSize>${maxFileSize}</maxFileSize> - <maxHistory>${maxHistory}</maxHistory> - <totalSizeCap>${totalSizeCap}</totalSizeCap> - </rollingPolicy> - <encoder> - <pattern>${debugPattern}</pattern> - </encoder> - </appender> - - <appender name="asyncDebug" class="ch.qos.logback.classic.AsyncAppender"> - <queueSize>256</queueSize> - <appender-ref ref="Debug" /> - <includeCallerData>true</includeCallerData> - </appender> - - <logger name="org.onap.cps" level="DEBUG" additivity="false"> - <appender-ref ref="asyncDebug" /> - </logger> - - - <root level="INFO"> - <appender-ref ref="asyncDebug" /> - </root> - -</configuration>
\ No newline at end of file diff --git a/cps-ri/src/test/java/org/onap/cps/DatabaseTestContainer.java b/cps-ri/src/test/java/org/onap/cps/DatabaseTestContainer.java index 759cc9531..a621b2ca4 100644 --- a/cps-ri/src/test/java/org/onap/cps/DatabaseTestContainer.java +++ b/cps-ri/src/test/java/org/onap/cps/DatabaseTestContainer.java @@ -44,6 +44,7 @@ public class DatabaseTestContainer extends PostgreSQLContainer<DatabaseTestConta public static DatabaseTestContainer getInstance() { if (databaseTestContainer == null) { databaseTestContainer = new DatabaseTestContainer(); + Runtime.getRuntime().addShutdownHook(new Thread(databaseTestContainer::terminate)); } return databaseTestContainer; } @@ -58,7 +59,10 @@ public class DatabaseTestContainer extends PostgreSQLContainer<DatabaseTestConta @Override public void stop() { - //do nothing, JVM handles shut down + // do nothing on test completion, image removal will be performed via terminate() on JVM shutdown } + private void terminate() { + super.stop(); + } } |