[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[libeufin] branch master updated: sandbox offers logfile name among opti
From: |
gnunet |
Subject: |
[libeufin] branch master updated: sandbox offers logfile name among options |
Date: |
Wed, 24 Jun 2020 12:09:26 +0200 |
This is an automated email from the git hooks/post-receive script.
ms pushed a commit to branch master
in repository libeufin.
The following commit(s) were added to refs/heads/master by this push:
new 3c50e81 sandbox offers logfile name among options
3c50e81 is described below
commit 3c50e816038d0efa289329f286cb81ac31fbbeee
Author: MS <ms@taler.net>
AuthorDate: Wed Jun 24 12:09:21 2020 +0200
sandbox offers logfile name among options
---
nexus/src/main/kotlin/tech/libeufin/nexus/Main.kt | 2 +-
sandbox/src/main/kotlin/tech/libeufin/sandbox/Main.kt | 6 +++++-
sandbox/src/main/resources/{logback.xml => late-logback.xml} | 3 ++-
util/src/main/kotlin/Config.kt | 2 ++
4 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/Main.kt
b/nexus/src/main/kotlin/tech/libeufin/nexus/Main.kt
index 9896243..f3510d5 100644
--- a/nexus/src/main/kotlin/tech/libeufin/nexus/Main.kt
+++ b/nexus/src/main/kotlin/tech/libeufin/nexus/Main.kt
@@ -33,7 +33,7 @@ import org.slf4j.Logger
import org.slf4j.LoggerFactory
import tech.libeufin.nexus.server.serverMain
import tech.libeufin.util.CryptoUtil.hashpw
-import setLogFile
+import tech.libeufin.util.*
lateinit var logger: Logger
diff --git a/sandbox/src/main/kotlin/tech/libeufin/sandbox/Main.kt
b/sandbox/src/main/kotlin/tech/libeufin/sandbox/Main.kt
index 8f77187..d88f010 100644
--- a/sandbox/src/main/kotlin/tech/libeufin/sandbox/Main.kt
+++ b/sandbox/src/main/kotlin/tech/libeufin/sandbox/Main.kt
@@ -64,13 +64,14 @@ import com.github.ajalt.clikt.parameters.arguments.argument
import com.github.ajalt.clikt.parameters.options.default
import com.github.ajalt.clikt.parameters.options.option
import com.github.ajalt.clikt.parameters.options.prompt
+import tech.libeufin.util.*
class CustomerNotFound(id: String?) : Exception("Customer ${id} not found")
class BadInputData(inputData: String?) : Exception("Customer provided invalid
input data: ${inputData}")
class UnacceptableFractional(badNumber: BigDecimal) : Exception(
"Unacceptable fractional part ${badNumber}"
)
-val LOGGER: Logger = LoggerFactory.getLogger("tech.libeufin.sandbox")
+lateinit var LOGGER: Logger
data class SandboxError(
val statusCode: HttpStatusCode,
@@ -83,7 +84,10 @@ class SandboxCommand : CliktCommand() {
class Serve : CliktCommand("Run sandbox HTTP server") {
private val dbName by option().default("libeufin-sandbox.sqlite3")
+ private val logFile by option()
override fun run() {
+ setLogFile(logFile, "sandboxLogFile", "late-logback.xml")
+ LOGGER = LoggerFactory.getLogger("tech.libeufin.sandbox")
serverMain(dbName)
}
}
diff --git a/sandbox/src/main/resources/logback.xml
b/sandbox/src/main/resources/late-logback.xml
similarity index 89%
rename from sandbox/src/main/resources/logback.xml
rename to sandbox/src/main/resources/late-logback.xml
index 7df7bcc..ddff919 100644
--- a/sandbox/src/main/resources/logback.xml
+++ b/sandbox/src/main/resources/late-logback.xml
@@ -5,8 +5,9 @@
</encoder>
</appender>
+ <property name="SANDBOX_LOG_FILE" value="${sandboxLogFile}" />
<appender name="SANDBOX-FILE" class="ch.qos.logback.core.FileAppender">
- <file>/tmp/sandbox.log</file>
+ <file>${SANDBOX_LOG_FILE}</file>
<append>false</append>
<encoder>
<pattern>%-5relative %-5level %logger{35} - %msg%n</pattern>
diff --git a/util/src/main/kotlin/Config.kt b/util/src/main/kotlin/Config.kt
index 62f3b27..8631086 100644
--- a/util/src/main/kotlin/Config.kt
+++ b/util/src/main/kotlin/Config.kt
@@ -1,3 +1,5 @@
+package tech.libeufin.util
+
import ch.qos.logback.classic.util.ContextInitializer
import ch.qos.logback.core.util.Loader
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [libeufin] branch master updated: sandbox offers logfile name among options,
gnunet <=