diff options
author | Antoine A <> | 2024-02-15 15:24:15 +0100 |
---|---|---|
committer | Antoine A <> | 2024-02-15 15:24:15 +0100 |
commit | 6a5cb8787cd341566af49c6514ccc90dce186691 (patch) | |
tree | d7e2c5de61a571d2a2edaf2b5d8d3531bfc2f5b6 /bank | |
parent | 5a5da42eb8bed68e1aa1ca00a9484bb6717edcfd (diff) | |
download | libeufin-6a5cb8787cd341566af49c6514ccc90dce186691.tar.gz libeufin-6a5cb8787cd341566af49c6514ccc90dce186691.tar.bz2 libeufin-6a5cb8787cd341566af49c6514ccc90dce186691.zip |
Reduce db logging and serve on localhost by default
Diffstat (limited to 'bank')
-rw-r--r-- | bank/src/main/kotlin/tech/libeufin/bank/Config.kt | 4 | ||||
-rw-r--r-- | bank/src/main/kotlin/tech/libeufin/bank/Main.kt | 8 |
2 files changed, 3 insertions, 9 deletions
diff --git a/bank/src/main/kotlin/tech/libeufin/bank/Config.kt b/bank/src/main/kotlin/tech/libeufin/bank/Config.kt index 42df06b4..5c67f292 100644 --- a/bank/src/main/kotlin/tech/libeufin/bank/Config.kt +++ b/bank/src/main/kotlin/tech/libeufin/bank/Config.kt @@ -65,7 +65,7 @@ data class ConversionRate ( sealed interface ServerConfig { data class Unix(val path: String, val mode: Int): ServerConfig - data class Tcp(val port: Int): ServerConfig + data class Tcp(val addr: String, val port: Int): ServerConfig } fun talerConfig(configPath: Path?): TalerConfig = BANK_CONFIG_SOURCE.fromFile(configPath) @@ -79,7 +79,7 @@ fun TalerConfig.loadDbConfig(): DatabaseConfig { fun TalerConfig.loadServerConfig(): ServerConfig { return when (val method = requireString("libeufin-bank", "serve")) { - "tcp" -> ServerConfig.Tcp(requireNumber("libeufin-bank", "port")) + "tcp" -> ServerConfig.Tcp(requireString("libeufin-bank", "address"), requireNumber("libeufin-bank", "port")) "unix" -> ServerConfig.Unix(requireString("libeufin-bank", "unixpath"), requireNumber("libeufin-bank", "unixpath_mode")) else -> throw TalerConfigError.invalid("server method", "libeufin-bank", "serve", "expected 'tcp' or 'unix' got '$method'") } diff --git a/bank/src/main/kotlin/tech/libeufin/bank/Main.kt b/bank/src/main/kotlin/tech/libeufin/bank/Main.kt index e6245238..60b61f8b 100644 --- a/bank/src/main/kotlin/tech/libeufin/bank/Main.kt +++ b/bank/src/main/kotlin/tech/libeufin/bank/Main.kt @@ -308,6 +308,7 @@ class ServeBank : CliktCommand("Run libeufin-bank HTTP server", name = "serve") when (serverCfg) { is ServerConfig.Tcp -> { port = serverCfg.port + host = serverCfg.addr } is ServerConfig.Unix -> throw Exception("Can only serve libeufin-bank via TCP") @@ -317,13 +318,6 @@ class ServeBank : CliktCommand("Run libeufin-bank HTTP server", name = "serve") } val local = embeddedServer(Netty, env) engine = local - when (serverCfg) { - is ServerConfig.Tcp -> { - logger.info("Server listening on http://localhost:${serverCfg.port}") - } - is ServerConfig.Unix -> - throw Exception("Can only serve libeufin-bank via TCP") - } local.start(wait = true) } } |