laantungir/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2026-08-09 08:04:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(cli): quiet quartz DEBUG logging by default, add --verbose/-v

Browse Source 
The CLI ran at the library's default Log.minLevel = DEBUG, so quartz internal
chatter (relay-auth init, MLS restore, URL-rejection, throttle notices) leaked
onto stderr around every command's real output. Set Log.minLevel = WARN at
startup, before dispatch, so a normal run shows only warnings/errors plus the
command's own progress. A new global --verbose / -v flag restores full DEBUG;
it's parsed with the other global flags so subcommands never see it.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01RWk2ZMrGBSr4WenKgwqmbB
This commit is contained in:
Claude
2026-07-07 22:27:19 +00:00
parent f95df91d6d
commit a013bcd9d9
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cli/src/main/kotlin/com/vitorpamplona/amethyst/cli/Main.kt
+13 -1
View File
@@ -71,6 +71,8 @@ import com.vitorpamplona.amethyst.cli.commands.cashu.CashuCommands
import com.vitorpamplona.amethyst.cli.commands.cashu.CashuMintCommands
import com.vitorpamplona.amethyst.cli.commands.route
import com.vitorpamplona.amethyst.cli.secrets.SecretStore
import com.vitorpamplona.quartz.utils.Log
import com.vitorpamplona.quartz.utils.LogLevel
import kotlinx.coroutines.runBlocking
import kotlin.system.exitProcess
@@ -104,6 +106,12 @@ fun main(argv: Array<String>) {
// braces guard for invocations that bypass the launcher scripts.
System.setProperty("java.awt.headless", "true")
// Quiet quartz's internal DEBUG chatter (relay auth, MLS restore, URL
// rejection, throttle notices) by default so it doesn't drown a command's
// own output; --verbose / -v restores full DEBUG. Set before dispatch so
// even startup logging is gated.
Log.minLevel = if (argv.any { it == "--verbose" || it == "-v" }) LogLevel.DEBUG else LogLevel.WARN
// Set output mode before dispatch so even argument-parsing errors
// honour --json.
if (argv.any { it == "--json" || it == "--json=true" }) {
@@ -150,6 +158,7 @@ private suspend fun dispatch(argv: Array<String>): Int {
GlobalFlag.SECRET_BACKEND -> secretBackendFlag = consumed.value
GlobalFlag.PASSPHRASE_FILE -> passphraseFileFlag = consumed.value
GlobalFlag.JSON -> Output.mode = Output.Mode.JSON
GlobalFlag.VERBOSE -> Unit // level already applied in main(); just strip it here
null -> filteredArgs.add(a)
}
i += consumed.tokensConsumed
@@ -267,11 +276,13 @@ private suspend fun marmotDispatch(
private enum class GlobalFlag(
val long: String,
val takesValue: Boolean = true,
val short: String? = null,
) {
ACCOUNT("--account"),
SECRET_BACKEND("--secret-backend"),
PASSPHRASE_FILE("--passphrase-file"),
JSON("--json", takesValue = false),
VERBOSE("--verbose", takesValue = false, short = "-v"),
}
private data class ConsumedFlag(
@@ -290,7 +301,7 @@ private fun extractGlobalFlag(
idx: Int,
): Pair<GlobalFlag?, ConsumedFlag> {
for (flag in GlobalFlag.values()) {
if (token == flag.long) {
if (token == flag.long || token == flag.short) {
return if (flag.takesValue) {
flag to ConsumedFlag(argv.getOrNull(idx + 1), 2)
} else {
@@ -315,6 +326,7 @@ private fun printUsage() {
| [--secret-backend auto|keychain|ncryptsec|plaintext]
| [--passphrase-file PATH]
| [--json]
| [--verbose|-v]
| <cmd> [args...]
|
|Account selection: