From a67478e3505538158542ccf8a798b359ea81a270 Mon Sep 17 00:00:00 2001
From: Mikhail Trofimov <mtrofimov@mfd.ru>
Date: Fri, 11 Jul 2025 13:01:47 +0300
Subject: [PATCH] Added mount for json logs

---
 Dockerfile                               |  1 +
 docker_compose/credit_tracker_config.env |  3 ++-
 docker_compose/docker-compose.yml        |  1 +
 src/main/resources/logback.xml           | 11 ++++++-----
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2a6b014..802be5f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,6 +3,7 @@ MAINTAINER ru.nbch
 RUN apk add gcompat bash
 
 VOLUME /opt/app/logs
+VOLUME /opt/app/json_logs
 VOLUME /opt/app/reports
 
 WORKDIR /opt/app
diff --git a/docker_compose/credit_tracker_config.env b/docker_compose/credit_tracker_config.env
index 121cd58..e43a250 100644
--- a/docker_compose/credit_tracker_config.env
+++ b/docker_compose/credit_tracker_config.env
@@ -6,7 +6,8 @@ JMX_HOSTNAME=
 
 #volumes
 REPORT_DIR=D:\folder_name\signals
-LOGS_DIR=D:\folder_name\signals\logs
+LOGS_DIR=D:\folder_name\signals\logs\app
+JSON_LOGS_DIR=D:\folder_name\signals\logs\json
 
 #APM settings
 APM_SERVICE_NAME=credit-tracker
diff --git a/docker_compose/docker-compose.yml b/docker_compose/docker-compose.yml
index 624274a..8596006 100644
--- a/docker_compose/docker-compose.yml
+++ b/docker_compose/docker-compose.yml
@@ -5,6 +5,7 @@ services:
     restart: always
     volumes:
       - ${LOGS_DIR}:/opt/app/logs
+      - ${JSON_LOGS_DIR}:/opt/app/json_logs
       - ${REPORT_DIR}:/opt/app/reports
     environment:
       - TZ=Europe/Moscow
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
index edffc40..e8963ec 100644
--- a/src/main/resources/logback.xml
+++ b/src/main/resources/logback.xml
@@ -1,8 +1,10 @@
 <configuration>
 
     <property name="basedir" value="${user.dir}" />
-    <property name="logFile" value="${basedir}/logs/credit-tracker.log" />
-    <property name="logFileNamePattern" value="${basedir}/logs/credit-tracker.%i.log" />
+    <property name="logFile" value="${basedir}/logs/app/credit-tracker.log" />
+    <property name="logFileNamePattern" value="${basedir}/logs/app/credit-tracker.%i.log" />
+    <property name="jsonLogFile" value="${basedir}/logs/json/credit-tracker-json.log" />
+    <property name="jsonLogFileNamePattern" value="${basedir}/logs/json/credit-tracker-json.%d{yyyy-MM-dd}.%i.gz" />
 
     <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
@@ -26,7 +28,7 @@
     </appender>
 
     <appender name="FILE-JSON" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${basedir}/logs/json/credit-tracker-json.log</file>
+        <file>${jsonLogFile}</file>
 
         <encoder class="net.logstash.logback.encoder.LogstashEncoder">
             <customFields>
@@ -52,8 +54,7 @@
             <includeCallerData>true</includeCallerData>
         </encoder>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${basedir}/logs/json/credit-tracker-json.%d{yyyy-MM-dd}.%i.gz
-            </fileNamePattern>
+            <fileNamePattern>${jsonLogFileNamePattern}</fileNamePattern>
             <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFileNamingAndTriggeringPolicy">
                 <maxFileSize>100MB</maxFileSize>
             </timeBasedFileNamingAndTriggeringPolicy>