From 29e380856b536093f1adb66e1a5a8419b3f55041 Mon Sep 17 00:00:00 2001 From: Ben Carman Date: Tue, 18 Aug 2020 14:37:22 -0500 Subject: [PATCH] Rolling log file location (#1846) * Rolling log file location * Fix file name --- app/server/src/main/resources/logback.xml | 11 ++++++++++- .../src/main/scala/org/bitcoins/server/Main.scala | 3 +-- .../src/main/scala/org/bitcoins/db/AppConfig.scala | 4 ++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/app/server/src/main/resources/logback.xml b/app/server/src/main/resources/logback.xml index 55c5b41108..1a33877bb2 100644 --- a/app/server/src/main/resources/logback.xml +++ b/app/server/src/main/resources/logback.xml @@ -24,7 +24,16 @@ - ${bitcoins.log.location} + ${bitcoins.log.location}/bitcoin-s.log + + + ${bitcoins.log.location}/logs/bitcoin-s-%d{yyyy-MM-dd_HH}.%i.log + + + 100MB + 48 + 2GB + %date{yyyy-MM-dd'T'HH:mm:ss,SSXXX} %level [%logger{0}] %msg%n diff --git a/app/server/src/main/scala/org/bitcoins/server/Main.scala b/app/server/src/main/scala/org/bitcoins/server/Main.scala index defafcf620..2e6de3f102 100644 --- a/app/server/src/main/scala/org/bitcoins/server/Main.scala +++ b/app/server/src/main/scala/org/bitcoins/server/Main.scala @@ -76,8 +76,7 @@ object Main extends App with BitcoinSLogger { datadirPath.resolve(lastDirname) } - System.setProperty("bitcoins.log.location", - datadir.resolve("bitcoin-s.log").toAbsolutePath.toString) + System.setProperty("bitcoins.log.location", datadir.toAbsolutePath.toString) implicit val system: ActorSystem = ActorSystem("bitcoin-s", baseConfig) implicit val ec: ExecutionContext = system.dispatcher diff --git a/db-commons/src/main/scala/org/bitcoins/db/AppConfig.scala b/db-commons/src/main/scala/org/bitcoins/db/AppConfig.scala index 108b9f1365..12520a8ef3 100644 --- a/db-commons/src/main/scala/org/bitcoins/db/AppConfig.scala +++ b/db-commons/src/main/scala/org/bitcoins/db/AppConfig.scala @@ -161,8 +161,8 @@ abstract class AppConfig extends LoggerConfig with StartStopAsync[Unit] { baseDatadir.resolve(lastDirname) } - override val logFile: Path = { - val path = datadir.resolve("bitcoin-s.log") + override val logLocation: Path = { + val path = datadir // Set property for loggers System.setProperty("bitcoins.log.location", path.toAbsolutePath.toString) path