From 5bff902394f96c530c3feaffa49a2b9d92d397ec Mon Sep 17 00:00:00 2001 From: AsamK Date: Wed, 25 Feb 2026 21:02:22 +0100 Subject: [PATCH] Configure signal service logger --- .../asamk/signal/manager/ManagerLogger.java | 2 + .../signal/manager/internal/SignalLogger.java | 46 +++++++++++++++++++ .../asamk/signal/logging/LogConfigurator.java | 4 +- 3 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 lib/src/main/java/org/asamk/signal/manager/internal/SignalLogger.java diff --git a/lib/src/main/java/org/asamk/signal/manager/ManagerLogger.java b/lib/src/main/java/org/asamk/signal/manager/ManagerLogger.java index c8437882..b6ae78b9 100644 --- a/lib/src/main/java/org/asamk/signal/manager/ManagerLogger.java +++ b/lib/src/main/java/org/asamk/signal/manager/ManagerLogger.java @@ -1,10 +1,12 @@ package org.asamk.signal.manager; import org.asamk.signal.manager.internal.LibSignalLogger; +import org.asamk.signal.manager.internal.SignalLogger; public class ManagerLogger { public static void initLogger() { LibSignalLogger.initLogger(); + SignalLogger.initLogger(); } } diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/SignalLogger.java b/lib/src/main/java/org/asamk/signal/manager/internal/SignalLogger.java new file mode 100644 index 00000000..ce46e71d --- /dev/null +++ b/lib/src/main/java/org/asamk/signal/manager/internal/SignalLogger.java @@ -0,0 +1,46 @@ +package org.asamk.signal.manager.internal; + +import org.signal.core.util.logging.Log; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class SignalLogger extends Log.Logger { + + private static final Logger logger = LoggerFactory.getLogger("LibSignalService"); + + public static void initLogger() { + Log.initialize(() -> true, new SignalLogger()); + } + + private SignalLogger() { + } + + @Override + public void v(final String tag, final String message, final Throwable throwable, final boolean b) { + logger.trace("[{}]: {}", tag, message, throwable); + } + + @Override + public void d(final String tag, final String message, final Throwable throwable, final boolean b) { + logger.debug("[{}]: {}", tag, message, throwable); + } + + @Override + public void i(final String tag, final String message, final Throwable throwable, final boolean b) { + logger.info("[{}]: {}", tag, message, throwable); + } + + @Override + public void w(final String tag, final String message, final Throwable throwable, final boolean b) { + logger.warn("[{}]: {}", tag, message, throwable); + } + + @Override + public void e(final String tag, final String message, final Throwable throwable, final boolean b) { + logger.error("[{}]: {}", tag, message, throwable); + } + + @Override + public void flush() { + } +} diff --git a/src/main/java/org/asamk/signal/logging/LogConfigurator.java b/src/main/java/org/asamk/signal/logging/LogConfigurator.java index 2ee7b5f0..b028193e 100644 --- a/src/main/java/org/asamk/signal/logging/LogConfigurator.java +++ b/src/main/java/org/asamk/signal/logging/LogConfigurator.java @@ -64,7 +64,9 @@ public class LogConfigurator extends ContextAwareBase implements Configurator { consoleAppender.addFilter(new Filter<>() { @Override public FilterReply decide(final ILoggingEvent event) { - return !"LibSignal".equals(event.getLoggerName()) && ( + return !"LibSignal".equals(event.getLoggerName()) + && !"LibSignalService".equals(event.getLoggerName()) + && ( event.getLevel().isGreaterOrEqual(Level.WARN) || ( event.getLevel().isGreaterOrEqual(Level.INFO) && event.getLoggerName() .startsWith("org.asamk")