From 09ccb04e0d0c898e84c1799911f70ef734cef5c8 Mon Sep 17 00:00:00 2001
From: Markus Storm <markus.storm@gmx.net>
Date: Wed, 1 Sep 2021 15:24:10 +0200
Subject: [PATCH 1/3] gzip logs as per default logging config

Signed-off-by: Markus Storm <markus.storm@gmx.net>
---
 .../openhab/src/main/resources/userdata/etc/log4j2.xml   | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/distributions/openhab/src/main/resources/userdata/etc/log4j2.xml b/distributions/openhab/src/main/resources/userdata/etc/log4j2.xml
index db257025e6..8355e94a50 100644
--- a/distributions/openhab/src/main/resources/userdata/etc/log4j2.xml
+++ b/distributions/openhab/src/main/resources/userdata/etc/log4j2.xml
@@ -7,30 +7,33 @@
 		</Console>
 
 		<!-- Rolling file appender -->
-		<RollingFile fileName="${sys:openhab.logdir}/openhab.log" filePattern="${sys:openhab.logdir}/openhab.log.%i" name="LOGFILE">
+		<RollingFile fileName="${sys:openhab.logdir}/openhab.log" filePattern="${sys:openhab.logdir}/openhab.log.%i.gz" name="LOGFILE">
 			<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} [%-5.5p] [%-36.36c] - %m%n"/>
 			<Policies>
 				<OnStartupTriggeringPolicy/>
 				<SizeBasedTriggeringPolicy size="16 MB"/>
 			</Policies>
+			<DefaultRolloverStrategy max="7"/>
 		</RollingFile>
 
 		<!-- Event log appender -->
-		<RollingRandomAccessFile fileName="${sys:openhab.logdir}/events.log" filePattern="${sys:openhab.logdir}/events.log.%i" name="EVENT">
+		<RollingRandomAccessFile fileName="${sys:openhab.logdir}/events.log" filePattern="${sys:openhab.logdir}/events.log.%i.gz" name="EVENT">
 			<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} [%-5.5p] [%-36.36c] - %m%n"/>
 			<Policies>
 				<OnStartupTriggeringPolicy/>
 				<SizeBasedTriggeringPolicy size="16 MB"/>
 			</Policies>
+			<DefaultRolloverStrategy max="7"/>
 		</RollingRandomAccessFile>
 
 		<!-- Audit file appender -->
-		<RollingRandomAccessFile fileName="${sys:openhab.logdir}/audit.log" filePattern="${sys:openhab.logdir}/audit.log.%i" name="AUDIT">
+		<RollingRandomAccessFile fileName="${sys:openhab.logdir}/audit.log" filePattern="${sys:openhab.logdir}/audit.log.%i.gz" name="AUDIT">
 			<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} [%-5.5p] [%-36.36c] - %m%n"/>
 			<Policies>
 				<OnStartupTriggeringPolicy/>
 				<SizeBasedTriggeringPolicy size="8 MB"/>
 			</Policies>
+			<DefaultRolloverStrategy max="7"/>
 		</RollingRandomAccessFile>
 
 		<!-- OSGi appender -->

From 27a5e4c67e3014ac79b3347cf189112657047a02 Mon Sep 17 00:00:00 2001
From: Markus Storm <markus.storm@gmx.net>
Date: Fri, 3 Sep 2021 15:11:37 +0200
Subject: [PATCH 2/3] sync log4j2.xml production/Eclipse

Signed-off-by: Markus Storm <markus.storm@gmx.net>
---
 launch/app/runtime/log4j2.xml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/launch/app/runtime/log4j2.xml b/launch/app/runtime/log4j2.xml
index 41f9957f53..24b0bf8b31 100644
--- a/launch/app/runtime/log4j2.xml
+++ b/launch/app/runtime/log4j2.xml
@@ -6,30 +6,33 @@
 		</Console>
 
 		<!-- Rolling file appender -->
-		<RollingFile fileName="${sys:openhab.logdir}/openhab.log" filePattern="${sys:openhab.logdir}/openhab.log.%i" name="LOGFILE">
+		<RollingFile fileName="${sys:openhab.logdir}/openhab.log" filePattern="${sys:openhab.logdir}/openhab.log.%i.gz" name="LOGFILE">
 			<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} [%-5.5p] [%-36.36c] - %m%n"/>
 			<Policies>
 				<OnStartupTriggeringPolicy/>
 				<SizeBasedTriggeringPolicy size="16 MB"/>
 			</Policies>
+			<DefaultRolloverStrategy max="7"/>
 		</RollingFile>
 
 		<!-- Event log appender -->
-		<RollingRandomAccessFile fileName="${sys:openhab.logdir}/events.log" filePattern="${sys:openhab.logdir}/events.log.%i" name="EVENT">
+		<RollingRandomAccessFile fileName="${sys:openhab.logdir}/events.log" filePattern="${sys:openhab.logdir}/events.log.%i.gz" name="EVENT">
 			<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} [%-5.5p] [%-36.36c] - %m%n"/>
 			<Policies>
 				<OnStartupTriggeringPolicy/>
 				<SizeBasedTriggeringPolicy size="16 MB"/>
 			</Policies>
+			<DefaultRolloverStrategy max="7"/>
 		</RollingRandomAccessFile>
 
 		<!-- Audit file appender -->
-		<RollingRandomAccessFile fileName="${sys:openhab.logdir}/audit.log" filePattern="${sys:openhab.logdir}/audit.log.%i" name="AUDIT">
+		<RollingRandomAccessFile fileName="${sys:openhab.logdir}/audit.log" filePattern="${sys:openhab.logdir}/audit.log.%i.gz" name="AUDIT">
 			<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} [%-5.5p] [%-36.36c] - %m%n"/>
 			<Policies>
 				<OnStartupTriggeringPolicy/>
 				<SizeBasedTriggeringPolicy size="8 MB"/>
 			</Policies>
+			<DefaultRolloverStrategy max="7"/>
 		</RollingRandomAccessFile>
 
 		<!-- OSGi appender -->

From 82b0d1c512d7f42b03ffa46498456588962c3d66 Mon Sep 17 00:00:00 2001
From: Markus Storm <markus.storm@gmx.net>
Date: Fri, 3 Sep 2021 17:43:03 +0200
Subject: [PATCH 3/3] keep log4j2.xml

Signed-off-by: Markus Storm <markus.storm@gmx.net>
---
 distributions/openhab/src/main/resources/bin/update.lst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/distributions/openhab/src/main/resources/bin/update.lst b/distributions/openhab/src/main/resources/bin/update.lst
index eb60926a78..2c0ed0f7a3 100644
--- a/distributions/openhab/src/main/resources/bin/update.lst
+++ b/distributions/openhab/src/main/resources/bin/update.lst
@@ -55,6 +55,9 @@ DEFAULT;$OPENHAB_USERDATA/etc/org.ops4j.pax.logging.cfg
 DEFAULT;$OPENHAB_USERDATA/etc/log4j2.xml
 DEFAULT;$OPENHAB_USERDATA/etc/org.ops4j.pax.logging.cfg
 
+[3.2.0]
+DEFAULT;$OPENHAB_USERDATA/etc/log4j2.xml
+
 [[POST]]
 [2.3.0]
 DELETE;$OPENHAB_USERDATA/etc/org.openhab.addons.cfg