diff options
Diffstat (limited to 'datafile-app-server/src/main/resources')
| -rw-r--r-- | datafile-app-server/src/main/resources/application.properties | 5 | ||||
| -rw-r--r-- | datafile-app-server/src/main/resources/keystore.jks | bin | 2643 -> 2627 bytes | |||
| -rw-r--r-- | datafile-app-server/src/main/resources/keystore.jks.old | bin | 2272 -> 0 bytes | |||
| -rw-r--r-- | datafile-app-server/src/main/resources/logback-spring.xml | 16 | ||||
| -rw-r--r-- | datafile-app-server/src/main/resources/scheduled-context.xml | 24 |
5 files changed, 21 insertions, 24 deletions
diff --git a/datafile-app-server/src/main/resources/application.properties b/datafile-app-server/src/main/resources/application.properties index 205b6caa..2b9d7b1d 100644 --- a/datafile-app-server/src/main/resources/application.properties +++ b/datafile-app-server/src/main/resources/application.properties @@ -1,10 +1,9 @@ spring.profiles.active=prod -spring.main.web-application-type=none server.port=8433 server.ssl.key-store-type=PKCS12 -server.ssl.key-store-password=nokiapnf +server.ssl.key-store-password=ericssondfc server.ssl.key-store=classpath:keystore.jks -server.ssl.key-password=nokiapnf +server.ssl.key-password=ericssondfc server.ssl.key-alias=tomcat-localhost logging.level.root=ERROR logging.level.org.springframework=ERROR diff --git a/datafile-app-server/src/main/resources/keystore.jks b/datafile-app-server/src/main/resources/keystore.jks Binary files differindex cd27cc01..574a585b 100644 --- a/datafile-app-server/src/main/resources/keystore.jks +++ b/datafile-app-server/src/main/resources/keystore.jks diff --git a/datafile-app-server/src/main/resources/keystore.jks.old b/datafile-app-server/src/main/resources/keystore.jks.old Binary files differdeleted file mode 100644 index 8a2b4f99..00000000 --- a/datafile-app-server/src/main/resources/keystore.jks.old +++ /dev/null diff --git a/datafile-app-server/src/main/resources/logback-spring.xml b/datafile-app-server/src/main/resources/logback-spring.xml index 925b38cc..af4ab189 100644 --- a/datafile-app-server/src/main/resources/logback-spring.xml +++ b/datafile-app-server/src/main/resources/logback-spring.xml @@ -12,11 +12,8 @@ <pattern>${FILE_LOG_PATTERN}</pattern> </encoder> <file>${LOG_FILE}</file> - <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy"> - <fileNamePattern>${LOG_FILE}.%d{yyyy-MM-dd}.%i.log</fileNamePattern> - <maxFileSize>50MB</maxFileSize> - <maxHistory>30</maxHistory> - <totalSizeCap>10GB</totalSizeCap> + <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> + <fileNamePattern>${LOG_FILE}.%d{yyyy-MM-dd}.log</fileNamePattern> </rollingPolicy> </appender> <root level="ERROR"> @@ -32,11 +29,12 @@ <pattern>${FILE_LOG_PATTERN}</pattern> </encoder> <file>${LOG_FILE}</file> - <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy"> + <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <fileNamePattern>${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz</fileNamePattern> - <maxFileSize>50MB</maxFileSize> - <maxHistory>30</maxHistory> - <totalSizeCap>10GB</totalSizeCap> + <timeBasedFileNamingAndTriggeringPolicy + class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"> + <maxFileSize>10MB</maxFileSize> + </timeBasedFileNamingAndTriggeringPolicy> </rollingPolicy> </appender> diff --git a/datafile-app-server/src/main/resources/scheduled-context.xml b/datafile-app-server/src/main/resources/scheduled-context.xml index 369d2c7b..21996319 100644 --- a/datafile-app-server/src/main/resources/scheduled-context.xml +++ b/datafile-app-server/src/main/resources/scheduled-context.xml @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:task="http://www.springframework.org/schema/task" - xmlns:context="http://www.springframework.org/schema/context" - xsi:schemaLocation="http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-4.0.xsd - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd"> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:task="http://www.springframework.org/schema/task" + xmlns:context="http://www.springframework.org/schema/context" + xsi:schemaLocation="http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-4.0.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd"> - <context:component-scan - base-package="org.onap.dcaegen2.collectors.datafile"/> - <task:scheduled-tasks> - <task:scheduled ref="scheduleController" method="startTasks" - fixed-rate="1000"/> - </task:scheduled-tasks> + <context:component-scan + base-package="org.onap.dcaegen2.collectors.datafile" /> + <task:scheduled-tasks> + <task:scheduled ref="scheduleController" + method="startTasks" fixed-rate="1000" /> + </task:scheduled-tasks> </beans> |