From dff2f505ec0946e3487dbaee0ef11cd113b28af6 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Wed, 6 Dec 2023 13:35:02 +0300
Subject: Fix logging configuration

---
 src/main/resources/application.properties |  1 +
 src/main/resources/logback-spring.xml     | 14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'src/main/resources')

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 17bc6322..e2aaa103 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,3 +1,4 @@
+logging.level.root=INFO
 server.servlet.session.tracking-modes=cookie
 spring.mvc.pathmatch.matching-strategy=ant-path-matcher
 spring.jackson.default-property-inclusion=non-default
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
index b4c70d28..021aa868 100644
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -3,39 +3,39 @@
 <configuration>
 	<include resource="org/springframework/boot/logging/logback/defaults.xml" />
 	<include resource="org/springframework/boot/logging/logback/console-appender.xml" />
-	<root level="INFO">
+	<root>
 		<appender-ref ref="CONSOLE" />
 	</root>
 	<springProfile name="production">
 		<include resource="org/springframework/boot/logging/logback/file-appender.xml" />
-		<property name="LOG_FILE" value="${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}/}server.log}" />
-		<root level="INFO">
+		<property name="LOG_DIR" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}" />
+		<root>
 			<appender-ref ref="CONSOLE" />
 			<appender-ref ref="FILE" />
 		</root>
 		<appender name="XMPP" class="ch.qos.logback.core.FileAppender">
-			<file>${LOG_PATH}/xmpp.log</file>
+			<file>${LOG_DIR}/xmpp.log</file>
 			<append>true</append>
 			<encoder>
 				<pattern>%d{yyyy-MM-dd HH:mm:ss} %logger{36} - %msg%n</pattern>
 			</encoder>
 		</appender>
 		<appender name="Session" class="ch.qos.logback.core.FileAppender">
-			<file>${LOG_PATH}/session.log</file>
+			<file>${LOG_DIR}/session.log</file>
 			<append>true</append>
 			<encoder>
 				<pattern>%d{yyyy-MM-dd HH:mm:ss} %logger{36} - %msg%n</pattern>
 			</encoder>
 		</appender>
 		<appender name="Telegram" class="ch.qos.logback.core.FileAppender">
-			<file>${LOG_PATH}/durov.log</file>
+			<file>${LOG_DIR}/durov.log</file>
 			<append>true</append>
 			<encoder>
 				<pattern>%d{yyyy-MM-dd HH:mm:ss} %logger{36} - %msg%n</pattern>
 			</encoder>
 		</appender>
 		<appender name="ActivityPub" class="ch.qos.logback.core.FileAppender">
-			<file>${LOG_PATH}/activity.log</file>
+			<file>${LOG_DIR}/activity.log</file>
 			<append>true</append>
 			<encoder>
 				<pattern>%d{yyyy-MM-dd HH:mm:ss} %logger{36} - %msg%n</pattern>
-- 
cgit v1.2.3