- added logback-spring.xml

MichiBaum · Dec 22, 2023 · a38310b · a38310b
1 parent ad4b5a9
commit a38310b
Show file tree

Hide file tree

Showing 23 changed files with 288 additions and 24 deletions.
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -4,6 +4,7 @@ on:
   pull_request:
     branches:
       - master
+      - develop
 
 jobs:
   build:

diff --git a/admin-service/pom.xml b/admin-service/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.michibaum</groupId>
 		<artifactId>microservice</artifactId>
-		<version>1.0.0-TEST-6</version>
+		<version>1.0.0-TEST-7</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

diff --git a/admin-service/src/main/resources/application.yml b/admin-service/src/main/resources/application.yml
@@ -33,6 +33,12 @@ spring:
 eureka:
   instance:
     prefer-ip-address: true
+  client:
+    enabled: true
+    fetch-registry: true
+    register-with-eureka: true
+    refresh:
+      enable: true
 
 management:
   endpoints:

diff --git a/admin-service/src/main/resources/logback-spring.xml b/admin-service/src/main/resources/logback-spring.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+
+    <property name="LOG_LOCATION" value="/var/log/application" />
+
+    <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
+        <layout class="ch.qos.logback.classic.PatternLayout">
+            <Pattern>
+                %black(%d{ISO8601}) %highlight(%-5level) [%blue(%t)] %yellow(%C{1.}): %msg%n%throwable
+            </Pattern>
+        </layout>
+    </appender>
+
+    <appender name="RollingFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${LOG_LOCATION}/application.log</file>
+        <encoder
+                class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <Pattern>%d %p %C{1.} [%t] %m%n</Pattern>
+        </encoder>
+
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- rollover daily and when the file reaches 10 MegaBytes -->
+            <fileNamePattern>${LOG_LOCATION}/archived/application-%d{yyyy-MM-dd}.%i.log
+            </fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>10MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+    </appender>
+
+    <!-- LOG everything at INFO level -->
+    <root level="info">
+        <appender-ref ref="RollingFile" />
+        <appender-ref ref="Console" />
+    </root>
+
+</configuration>
diff --git a/authentication-library/pom.xml b/authentication-library/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>microservice</artifactId>
         <groupId>com.michibaum</groupId>
-        <version>1.0.0-TEST-6</version>
+        <version>1.0.0-TEST-7</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/authentication-service/pom.xml b/authentication-service/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>microservice</artifactId>
         <groupId>com.michibaum</groupId>
-        <version>1.0.0-TEST-6</version>
+        <version>1.0.0-TEST-7</version>
     </parent>
 
     <artifactId>authentication-service</artifactId>
@@ -79,12 +79,12 @@
         <dependency>
             <groupId>com.michibaum</groupId>
             <artifactId>authentication-library</artifactId>
-            <version>1.0.0-TEST-6</version>
+            <version>1.0.0-TEST-7</version>
         </dependency>
         <dependency>
             <groupId>com.michibaum</groupId>
             <artifactId>usermanagement-library</artifactId>
-            <version>1.0.0-TEST-6</version>
+            <version>1.0.0-TEST-7</version>
         </dependency>
 
     </dependencies>

diff --git a/authentication-service/src/main/resources/application.yml b/authentication-service/src/main/resources/application.yml
@@ -30,6 +30,12 @@ spring:
 eureka:
   instance:
     prefer-ip-address: true
+  client:
+    enabled: true
+    fetch-registry: true
+    register-with-eureka: true
+    refresh:
+      enable: true
 
 management:
   endpoints:

diff --git a/authentication-service/src/main/resources/logback-spring.xml b/authentication-service/src/main/resources/logback-spring.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+
+    <property name="LOG_LOCATION" value="/var/log/application" />
+
+    <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
+        <layout class="ch.qos.logback.classic.PatternLayout">
+            <Pattern>
+                %black(%d{ISO8601}) %highlight(%-5level) [%blue(%t)] %yellow(%C{1.}): %msg%n%throwable
+            </Pattern>
+        </layout>
+    </appender>
+
+    <appender name="RollingFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${LOG_LOCATION}/application.log</file>
+        <encoder
+                class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <Pattern>%d %p %C{1.} [%t] %m%n</Pattern>
+        </encoder>
+
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- rollover daily and when the file reaches 10 MegaBytes -->
+            <fileNamePattern>${LOG_LOCATION}/archived/application-%d{yyyy-MM-dd}.%i.log
+            </fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>10MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+    </appender>
+
+    <!-- LOG everything at INFO level -->
+    <root level="info">
+        <appender-ref ref="RollingFile" />
+        <appender-ref ref="Console" />
+    </root>
+
+</configuration>
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.7'
 services:
 
   registry-service:
-    image: 70131370/registry-service:1.0.0-TEST-6
+    image: 70131370/registry-service:1.0.0-TEST-7
     env_file:
       - .env
       - .env.override
@@ -12,11 +12,13 @@ services:
       spring_profiles_active: ${SPRING_ACTIVE_PROFILES}
     expose:
       - "8761"
+    volumes:
+      - /data/registry-service/logs:/var/log/application
     networks:
       - microservice-network
 
   admin-service:
-    image: 70131370/admin-service:1.0.0-TEST-6
+    image: 70131370/admin-service:1.0.0-TEST-7
     env_file:
       - .env
       - .env.override
@@ -27,11 +29,13 @@ services:
       spring_profiles_active: ${SPRING_ACTIVE_PROFILES}
     expose:
       - "80"
+    volumes:
+      - /data/admin-service/logs:/var/log/application
     networks:
       - microservice-network
 
   javadoc-service:
-    image: 70131370/javadoc-service:1.0.0-TEST-6
+    image: 70131370/javadoc-service:1.0.0-TEST-7
     env_file:
       - .env
       - .env.override
@@ -42,11 +46,13 @@ services:
       spring_profiles_active: ${SPRING_ACTIVE_PROFILES}
     expose:
       - "80"
+    volumes:
+      - /data/javadoc-service/logs:/var/log/application
     networks:
       - microservice-network
 
   authentication-service:
-    image: 70131370/authentication-service:1.0.0-TEST-6
+    image: 70131370/authentication-service:1.0.0-TEST-7
     env_file:
       - .env
       - .env.override
@@ -57,6 +63,8 @@ services:
       spring_profiles_active: ${SPRING_ACTIVE_PROFILES}
     expose:
       - "80"
+    volumes:
+      - /data/authentication-service/logs:/var/log/application
     networks:
       - microservice-network
 
@@ -77,7 +85,7 @@ services:
       - microservice-network
 
   usermanagement-service:
-    image: 70131370/usermanagement-service:1.0.0-TEST-6
+    image: 70131370/usermanagement-service:1.0.0-TEST-7
     env_file:
       - .env
       - .env.override
@@ -91,6 +99,8 @@ services:
       DATABASE: ${USERMANAGEMENT_DB}
     expose:
       - "80"
+    volumes:
+      - /data/usermanagement-service/logs:/var/log/application
     networks:
       - microservice-network
 
@@ -111,7 +121,7 @@ services:
       - microservice-network
 
   gateway-service:
-    image: 70131370/gateway-service:1.0.0-TEST-6
+    image: 70131370/gateway-service:1.0.0-TEST-7
     env_file:
       - .env
       - .env.override
@@ -122,10 +132,12 @@ services:
       - authentication-service
       - javadoc-service
       - admin-service
-    ports:
-      - "80:80"
     environment:
       spring_profiles_active: ${SPRING_ACTIVE_PROFILES}
+    ports:
+      - "80:80"
+    volumes:
+      - /data/gateway-service/logs:/var/log/application
     networks:
       - microservice-network
 

diff --git a/gateway-service/pom.xml b/gateway-service/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>microservice</artifactId>
 		<groupId>com.michibaum</groupId>
-		<version>1.0.0-TEST-6</version>
+		<version>1.0.0-TEST-7</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -55,7 +55,7 @@
 		<dependency>
 			<groupId>com.michibaum</groupId>
 			<artifactId>permission-library</artifactId>
-			<version>1.0.0-TEST-6</version>
+			<version>1.0.0-TEST-7</version>
 		</dependency>
 
 	</dependencies>

diff --git a/gateway-service/src/main/resources/application.yml b/gateway-service/src/main/resources/application.yml
@@ -29,10 +29,15 @@ spring:
         username: admin
         password: admin
 
-
 eureka:
   instance:
     prefer-ip-address: true
+  client:
+    enabled: true
+    fetch-registry: true
+    register-with-eureka: true
+    refresh:
+      enable: true
 
 management:
   endpoints:

diff --git a/gateway-service/src/main/resources/logback-spring.xml b/gateway-service/src/main/resources/logback-spring.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+
+    <property name="LOG_LOCATION" value="/var/log/application" />
+
+    <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
+        <layout class="ch.qos.logback.classic.PatternLayout">
+            <Pattern>
+                %black(%d{ISO8601}) %highlight(%-5level) [%blue(%t)] %yellow(%C{1.}): %msg%n%throwable
+            </Pattern>
+        </layout>
+    </appender>
+
+    <appender name="RollingFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${LOG_LOCATION}/application.log</file>
+        <encoder
+                class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <Pattern>%d %p %C{1.} [%t] %m%n</Pattern>
+        </encoder>
+
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- rollover daily and when the file reaches 10 MegaBytes -->
+            <fileNamePattern>${LOG_LOCATION}/archived/application-%d{yyyy-MM-dd}.%i.log
+            </fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>10MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+    </appender>
+
+    <!-- LOG everything at INFO level -->
+    <root level="info">
+        <appender-ref ref="RollingFile" />
+        <appender-ref ref="Console" />
+    </root>
+
+</configuration>
diff --git a/javadoc-service/pom.xml b/javadoc-service/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>microservice</artifactId>
 		<groupId>com.michibaum</groupId>
-		<version>1.0.0-TEST-6</version>
+		<version>1.0.0-TEST-7</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

diff --git a/javadoc-service/src/main/resources/application.yml b/javadoc-service/src/main/resources/application.yml
@@ -20,6 +20,12 @@ spring:
 eureka:
   instance:
     prefer-ip-address: true
+  client:
+    enabled: true
+    fetch-registry: true
+    register-with-eureka: true
+    refresh:
+      enable: true
 
 management:
   endpoints:

diff --git a/javadoc-service/src/main/resources/logback-spring.xml b/javadoc-service/src/main/resources/logback-spring.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+
+    <property name="LOG_LOCATION" value="/var/log/application" />
+
+    <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
+        <layout class="ch.qos.logback.classic.PatternLayout">
+            <Pattern>
+                %black(%d{ISO8601}) %highlight(%-5level) [%blue(%t)] %yellow(%C{1.}): %msg%n%throwable
+            </Pattern>
+        </layout>
+    </appender>
+
+    <appender name="RollingFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${LOG_LOCATION}/application.log</file>
+        <encoder
+                class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <Pattern>%d %p %C{1.} [%t] %m%n</Pattern>
+        </encoder>
+
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- rollover daily and when the file reaches 10 MegaBytes -->
+            <fileNamePattern>${LOG_LOCATION}/archived/application-%d{yyyy-MM-dd}.%i.log
+            </fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>10MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+    </appender>
+
+    <!-- LOG everything at INFO level -->
+    <root level="info">
+        <appender-ref ref="RollingFile" />
+        <appender-ref ref="Console" />
+    </root>
+
+</configuration>
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ on: @@
       pull_request:
         branches:
           - master
+          - develop
     jobs:
       build:
@@ Expand Down @@