From 8f55f0d028bc1cfae01d95eb6f35c3d58ad141b5 Mon Sep 17 00:00:00 2001 From: edge790 Date: Sat, 25 Jun 2022 15:35:19 +0300 Subject: [PATCH 1/2] feat: DefaultCliLogger now logs info, trace to stdOut, and warn, error to stdErr --- .../cli/logging/impl/DefaultCliLogger.kt | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/main/kotlin/app/revanced/cli/logging/impl/DefaultCliLogger.kt b/src/main/kotlin/app/revanced/cli/logging/impl/DefaultCliLogger.kt index 395922b9..3e5f9729 100644 --- a/src/main/kotlin/app/revanced/cli/logging/impl/DefaultCliLogger.kt +++ b/src/main/kotlin/app/revanced/cli/logging/impl/DefaultCliLogger.kt @@ -3,18 +3,26 @@ package app.revanced.cli.logging.impl import app.revanced.cli.command.MainCommand import app.revanced.cli.logging.CliLogger import java.util.logging.Logger +import java.util.logging.SimpleFormatter +import java.util.logging.StreamHandler internal class DefaultCliLogger( - private val logger: Logger = Logger.getLogger(MainCommand::javaClass.name) + private val stdOutLogger: Logger = Logger.getLogger(MainCommand::javaClass.name), + private val stdErrLogger: Logger = Logger.getLogger(MainCommand::javaClass.name + "Err") ) : CliLogger { + + init { + stdOutLogger.useParentHandlers = false + stdOutLogger.addHandler(StreamHandler(System.out, SimpleFormatter())) + } companion object { init { System.setProperty("java.util.logging.SimpleFormatter.format", "%4\$s: %5\$s %n") } } - override fun error(msg: String) = logger.severe(msg) - override fun info(msg: String) = logger.info(msg) - override fun trace(msg: String) = logger.finest(msg) - override fun warn(msg: String) = logger.warning(msg) + override fun error(msg: String) = stdErrLogger.severe(msg) + override fun info(msg: String) = stdOutLogger.info(msg) + override fun trace(msg: String) = stdOutLogger.finest(msg) + override fun warn(msg: String) = stdErrLogger.warning(msg) } \ No newline at end of file From dd0f378cb7d44c3a1c1a0ceac88134c6f0996a87 Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Sun, 3 Jul 2022 15:59:05 +0200 Subject: [PATCH 2/2] refactor: normalize logger property names --- .../cli/logging/impl/DefaultCliLogger.kt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/kotlin/app/revanced/cli/logging/impl/DefaultCliLogger.kt b/src/main/kotlin/app/revanced/cli/logging/impl/DefaultCliLogger.kt index 3e5f9729..a433c4eb 100644 --- a/src/main/kotlin/app/revanced/cli/logging/impl/DefaultCliLogger.kt +++ b/src/main/kotlin/app/revanced/cli/logging/impl/DefaultCliLogger.kt @@ -7,13 +7,13 @@ import java.util.logging.SimpleFormatter import java.util.logging.StreamHandler internal class DefaultCliLogger( - private val stdOutLogger: Logger = Logger.getLogger(MainCommand::javaClass.name), - private val stdErrLogger: Logger = Logger.getLogger(MainCommand::javaClass.name + "Err") + private val logger: Logger = Logger.getLogger(MainCommand::javaClass.name), + private val errorLogger: Logger = Logger.getLogger(MainCommand::javaClass.name + "Err") ) : CliLogger { init { - stdOutLogger.useParentHandlers = false - stdOutLogger.addHandler(StreamHandler(System.out, SimpleFormatter())) + logger.useParentHandlers = false + logger.addHandler(StreamHandler(System.out, SimpleFormatter())) } companion object { init { @@ -21,8 +21,8 @@ internal class DefaultCliLogger( } } - override fun error(msg: String) = stdErrLogger.severe(msg) - override fun info(msg: String) = stdOutLogger.info(msg) - override fun trace(msg: String) = stdOutLogger.finest(msg) - override fun warn(msg: String) = stdErrLogger.warning(msg) -} \ No newline at end of file + override fun error(msg: String) = errorLogger.severe(msg) + override fun info(msg: String) = logger.info(msg) + override fun trace(msg: String) = logger.finest(msg) + override fun warn(msg: String) = errorLogger.warning(msg) +}