From d739f0ecf74320b736fd3df3deb69dcc20ee9f19 Mon Sep 17 00:00:00 2001
From: PROTOPAPAS Thanasis <thanasis.protopapas@sword-group.com>
Date: Wed, 10 Feb 2021 17:55:47 +0200
Subject: [PATCH] [UNIONVMS-4981] logback.xml fix

---
 pom.xml                                |  2 +-
 service/src/main/resources/logback.xml | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index a7e4ab85..117879db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@
 
     <application.name>${project.parent.artifactId}</application.name>
     <application.version>${project.parent.version}</application.version>
-    <application.logfile>${project.parent.artifactId}/${project.parent.artifactId}.log
+    <application.logfile>${project.parent.artifactId}.log
     </application.logfile>
     <application.logfile.boot>/app/logs/${project.parent.artifactId}/${project.parent.artifactId}-boot.log
     </application.logfile.boot>
diff --git a/service/src/main/resources/logback.xml b/service/src/main/resources/logback.xml
index aecf4d97..f886128e 100644
--- a/service/src/main/resources/logback.xml
+++ b/service/src/main/resources/logback.xml
@@ -12,14 +12,14 @@
     <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <append>true</append>
         <file>${LOG_FILE_BASE_PATH}/${application.logfile}</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${LOG_FILE_BASE_PATH}/${application.logfile}.%d{yyyy-MM-dd}.%i.log.gz
-            </fileNamePattern>
-            <maxHistory>10</maxHistory>
-            <TimeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <MaxFileSize>100MB</MaxFileSize>
-            </TimeBasedFileNamingAndTriggeringPolicy>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_FILE_BASE_PATH}/${application.logfile}.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+            <!-- each archived file, size max 100MB -->
+            <maxFileSize>100MB</maxFileSize>
+            <!-- total size of all archive files, if total size > 1GB, it will delete old archived file -->
             <totalSizeCap>1GB</totalSizeCap>
+            <!-- 10 days to keep -->
+            <maxHistory>10</maxHistory>
         </rollingPolicy>
         <encoder>
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %X{mdcvars:--} %-5level %logger{35} - %msg ${application.logfile.message.pattern}</pattern>