Keep required logger files

namehillsoftware · Apr 22, 2023 · 6d4def3 · 6d4def3
1 parent c0f6572
commit 6d4def3
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 18 deletions.
diff --git a/projectBlueWater/build.gradle b/projectBlueWater/build.gradle
@@ -103,7 +103,7 @@ android {
             returnDefaultValues = true
 			all {
 				maxHeapSize = "2048m"
-				maxParallelForks = 2
+				maxParallelForks = 3
 				systemProperty 'robolectric.sqliteMode', 'NATIVE'
 			}
 		}

diff --git a/projectBlueWater/proguard-rules.pro b/projectBlueWater/proguard-rules.pro
@@ -35,5 +35,7 @@
     public static final ** CREATOR;
 }
 
+-keepclassmembers class ch.qos.logback.core.rolling.helper.* { <init>(); }
+
 # -printseeds /home/david/sandbox/projectBlue/projectBlueWater/release/seeds.txt # print out classes that are kept
 # -printusage /home/david/sandbox/projectBlue/projectBlueWater/release/usage.txt # print out classes that are obfuscated
diff --git a/projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/MainApplication.kt b/projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/MainApplication.kt
@@ -199,27 +199,30 @@ open class MainApplication : Application() {
 			if (externalFilesDir != null) {
 				val logDir = File(externalFilesDir.path + File.separator + "logs")
 				if (!logDir.exists()) logDir.mkdirs()
-				val filePle = PatternLayoutEncoder()
-				filePle.pattern = "%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n"
-				filePle.context = lc
-				filePle.start()
-
-				val rollingFileAppender = RollingFileAppender<ILoggingEvent>()
-				rollingFileAppender.lazy = true
-				rollingFileAppender.isAppend = true
-				rollingFileAppender.context = lc
-				rollingFileAppender.encoder = filePle
-
-				rollingFileAppender.rollingPolicy = TimeBasedRollingPolicy<ILoggingEvent>().apply {
-					fileNamePattern = File(logDir, "%d{yyyy-MM-dd}.log").absolutePath
-					maxHistory = 30
-					setParent(rollingFileAppender) // parent and context required!
+				val rollingFileAppender = RollingFileAppender<ILoggingEvent>().apply {
+					lazy = true
+					isAppend = true
 					context = lc
+					file = File(logDir, "log.log").absolutePath
+
+					rollingPolicy = TimeBasedRollingPolicy<ILoggingEvent>()
+						.also { it.setParent(this) }
+						.apply {
+							fileNamePattern = File(logDir, "%d{yyyy-MM-dd}.log").absolutePath
+							maxHistory = 30
+							context = lc
+							start()
+						}
+
+					encoder = PatternLayoutEncoder().apply {
+						pattern = "%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n"
+						context = lc
+						start()
+					}
+
 					start()
 				}
 
-				rollingFileAppender.start()
-
 				asyncAppender.addAppender(rollingFileAppender)
 			}