From 63df35e07122be51643f8ed6fac6a9c567616a31 Mon Sep 17 00:00:00 2001 From: Jorge Martin Espinosa Date: Fri, 19 Jul 2024 12:33:33 +0200 Subject: [PATCH] Use the right filename for log files so they're sorted in rageshakes (#3219) * Use the right filename for log files so they're sorted in rageshakes * Hide the suffix part so it's not changed by accident --- .../io/element/android/x/initializer/TracingInitializer.kt | 3 +-- .../matrix/api/tracing/WriteToFilesConfiguration.kt | 6 ++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/src/main/kotlin/io/element/android/x/initializer/TracingInitializer.kt b/app/src/main/kotlin/io/element/android/x/initializer/TracingInitializer.kt index 7c94af4619..e310a61147 100644 --- a/app/src/main/kotlin/io/element/android/x/initializer/TracingInitializer.kt +++ b/app/src/main/kotlin/io/element/android/x/initializer/TracingInitializer.kt @@ -71,8 +71,7 @@ class TracingInitializer : Initializer { return WriteToFilesConfiguration.Enabled( directory = bugReporter.logDirectory().absolutePath, filenamePrefix = "logs", - filenameSuffix = null, - // Keep a minimum of 1 week of log files. + // Keep a maximum of 1 week of log files. numberOfFiles = 7 * 24, ) } diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/tracing/WriteToFilesConfiguration.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/tracing/WriteToFilesConfiguration.kt index b814bdd5c4..cbc6bacacf 100644 --- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/tracing/WriteToFilesConfiguration.kt +++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/tracing/WriteToFilesConfiguration.kt @@ -21,7 +21,9 @@ sealed interface WriteToFilesConfiguration { data class Enabled( val directory: String, val filenamePrefix: String, - val filenameSuffix: String?, val numberOfFiles: Int?, - ) : WriteToFilesConfiguration + ) : WriteToFilesConfiguration { + // DO NOT CHANGE: suffix *MUST* be "log" for the rageshake server to not rename the file to something generic + val filenameSuffix = "log" + } }