Skip to content

Commit 43fc20d

Browse files
committed
fix: Filter logs correctly
BREAKING CHANGE: This changes the log handler signature
1 parent e3851d5 commit 43fc20d

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

revanced-lib/api/revanced-lib.api

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public final class app/revanced/lib/adb/AdbManager$UserAdbManager : app/revanced
6969

7070
public final class app/revanced/lib/logging/Logger {
7171
public static final field INSTANCE Lapp/revanced/lib/logging/Logger;
72-
public final fun addHandler (Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)V
72+
public final fun addHandler (Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)V
7373
public final fun removeAllHandlers ()V
7474
public final fun setDefault ()V
7575
public final fun setFormat (Ljava/lang/String;)V

revanced-lib/src/main/kotlin/app/revanced/lib/logging/Logger.kt

+9-3
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,15 @@ object Logger {
3838
* @param closeHandler The handler for closing the log.
3939
*/
4040
fun addHandler(
41-
publishHandler: (log: String, level: Level) -> Unit,
41+
publishHandler: (log: String, level: Level, loggerName: String?) -> Unit,
4242
flushHandler: () -> Unit,
4343
closeHandler: () -> Unit
4444
) = object : Handler() {
45-
override fun publish(record: LogRecord) = publishHandler(formatter.format(record), record.level)
45+
override fun publish(record: LogRecord) = publishHandler(
46+
formatter.format(record),
47+
record.level,
48+
record.loggerName
49+
)
4650

4751
override fun flush() = flushHandler()
4852

@@ -59,7 +63,9 @@ object Logger {
5963
setFormat()
6064
removeAllHandlers()
6165

62-
val publishHandler = { log: String, level: Level ->
66+
val publishHandler = handler@{ log: String, level: Level, loggerName: String? ->
67+
if (loggerName?.startsWith("app.revanced") != true) return@handler
68+
6369
log.toByteArray().let {
6470
if (level.intValue() > Level.INFO.intValue())
6571
System.err.write(it)

0 commit comments

Comments
 (0)