Skip to content

Commit 9171706

Browse files
committed
Fix log rotation breaking changes. The new values match iOS (element-hq/element-x-ios#5108)
1 parent 00ea5d6 commit 9171706

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/tracing/WriteToFilesConfiguration.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ sealed interface WriteToFilesConfiguration {
1515
val filenamePrefix: String,
1616
val numberOfFiles: Int?,
1717
) : WriteToFilesConfiguration {
18-
// DO NOT CHANGE: suffix *MUST* be "log" for the rageshake server to not rename the file to something generic
19-
val filenameSuffix = "log"
18+
// DO NOT CHANGE: suffix *MUST* be ".log" for the rageshake server to not rename the file to something generic
19+
val filenameSuffix = ".log"
2020
}
2121
}

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/tracing/RustTracingService.kt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ package io.element.android.libraries.matrix.impl.tracing
1010

1111
import dev.zacsweers.metro.AppScope
1212
import dev.zacsweers.metro.ContributesBinding
13+
import io.element.android.libraries.core.data.ByteUnit
14+
import io.element.android.libraries.core.data.megaBytes
1315
import io.element.android.libraries.core.meta.BuildMeta
1416
import io.element.android.libraries.matrix.api.tracing.LogLevel
1517
import io.element.android.libraries.matrix.api.tracing.TracingConfiguration
@@ -49,7 +51,10 @@ private fun WriteToFilesConfiguration.toTracingFileConfiguration(): TracingFileC
4951
path = directory,
5052
filePrefix = filenamePrefix,
5153
fileSuffix = filenameSuffix,
52-
maxFiles = numberOfFiles?.toULong(),
54+
// Have at max 100MB of logs in disk
55+
maxTotalSizeBytes = 100.megaBytes.into(ByteUnit.BYTES).toULong(),
56+
// Store up to 7 days of logs
57+
maxAgeSeconds = (7 * 24 * 60 * 60).toULong(),
5358
)
5459
}
5560
}

0 commit comments

Comments
 (0)