commit f22d15b4ae57777fb988c00329faa94696f94c97
parent abc3bca611f7eb0e11cf5ed3875e53c31dd195a6
Author: MS <ms@taler.net>
Date: Wed, 24 Jun 2020 17:10:44 +0200
avoiding having a log file
Diffstat:
6 files changed, 41 insertions(+), 73 deletions(-)
diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/Main.kt b/nexus/src/main/kotlin/tech/libeufin/nexus/Main.kt
@@ -48,11 +48,9 @@ class Serve : CliktCommand("Run nexus HTTP server") {
helpFormatter = CliktHelpFormatter(showDefaultValues = true)
}
}
- private val logFile by option()
private val dbName by option().default("libeufin-nexus.sqlite3")
private val host by option().default("127.0.0.1")
override fun run() {
- setLogFile(logFile, "nexusLogFile","late-logback.xml")
logger = LoggerFactory.getLogger("tech.libeufin.nexus")
serverMain(dbName, host)
}
diff --git a/nexus/src/main/resources/late-logback.xml b/nexus/src/main/resources/late-logback.xml
@@ -1,28 +0,0 @@
-<!-- configuration scan="true" -->
-<configuration scan="true">
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
- </encoder>
- </appender>
-
- <property name="NEXUS_LOG_FILE" value="${nexusLogFile}" />
- <appender name="NEXUS-FILE" class="ch.qos.logback.core.FileAppender">
- <file>${NEXUS_LOG_FILE}</file>
- <append>true</append>
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
- </encoder>
- </appender>
-
- <logger name="tech.libeufin" level="TRACE"/>
- <logger name="io.netty" level="WARN"/>
- <logger name="ktor" level="WARN"/>
- <logger name="Exposed" level="WARN"/>
-
- <root level="WARN">
- <appender-ref ref="STDOUT"/>
- <appender-ref ref="NEXUS-FILE"/>
- </root>
-
-</configuration>
-\ No newline at end of file
diff --git a/nexus/src/main/resources/logback.xml b/nexus/src/main/resources/logback.xml
@@ -0,0 +1,18 @@
+<!-- configuration scan="true" -->
+<configuration scan="true">
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+ </encoder>
+ </appender>
+
+ <logger name="tech.libeufin" level="TRACE"/>
+ <logger name="io.netty" level="WARN"/>
+ <logger name="ktor" level="WARN"/>
+ <logger name="Exposed" level="WARN"/>
+
+ <root level="WARN">
+ <appender-ref ref="STDOUT"/>
+ </root>
+
+</configuration>
+\ No newline at end of file
diff --git a/sandbox/src/main/kotlin/tech/libeufin/sandbox/Main.kt b/sandbox/src/main/kotlin/tech/libeufin/sandbox/Main.kt
@@ -58,12 +58,9 @@ import io.ktor.http.toHttpDateString
import org.jetbrains.exposed.sql.statements.api.ExposedBlob
import java.time.Instant
import com.github.ajalt.clikt.core.CliktCommand
-import com.github.ajalt.clikt.core.ProgramResult
import com.github.ajalt.clikt.core.subcommands
-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")
@@ -84,9 +81,7 @@ 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/late-logback.xml b/sandbox/src/main/resources/late-logback.xml
@@ -1,36 +0,0 @@
-<configuration>
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
- </encoder>
- </appender>
-
- <property name="SANDBOX_LOG_FILE" value="${sandboxLogFile}" />
- <appender name="SANDBOX-FILE" class="ch.qos.logback.core.FileAppender">
- <file>${SANDBOX_LOG_FILE}</file>
- <append>false</append>
- <encoder>
- <pattern>%-5relative %-5level %logger{35} - %msg%n</pattern>
- </encoder>
- </appender>
-
- <logger name="tech.libeufin.sandbox" level="DEBUG" additivity="false">
- <appender-ref ref="STDOUT" />
- <appender-ref ref="SANDBOX-FILE" />
- </logger>
-
- <logger name="tech.libeufin.util" level="TRACE" additivity="false">
- <appender-ref ref="STDOUT" />
- <appender-ref ref="SANDBOX-FILE" />
- </logger>
-
-
- <logger name="io.netty" level="WARN" />
- <logger name="ktor" level="WARN" />
- <logger name="Exposed" level="WARN" />
-
- <root level="WARN">
- <appender-ref ref="STDOUT" />
- </root>
-
-</configuration>
-\ No newline at end of file
diff --git a/sandbox/src/main/resources/logback.xml b/sandbox/src/main/resources/logback.xml
@@ -0,0 +1,21 @@
+<configuration>
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+ </encoder>
+ </appender>
+
+ <logger name="tech.libeufin.sandbox" level="DEBUG" additivity="false">
+ <appender-ref ref="STDOUT" />
+ <appender-ref ref="SANDBOX-FILE" />
+ </logger>
+
+ <logger name="io.netty" level="WARN" />
+ <logger name="ktor" level="WARN" />
+ <logger name="Exposed" level="WARN" />
+
+ <root level="WARN">
+ <appender-ref ref="STDOUT" />
+ </root>
+
+</configuration>
+\ No newline at end of file
