From e103f1f1c2bcfafb82fc29fa8fffed26df6b5cbe Mon Sep 17 00:00:00 2001 From: Jakob Odersky Date: Wed, 12 Sep 2018 11:45:51 -0700 Subject: Add backwards compatibility layer for application contexts --- src/main/scala/xyz/driver/core/app/init.scala | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/scala/xyz/driver/core/app/init.scala b/src/main/scala/xyz/driver/core/app/init.scala index bb7a798..d505f0f 100644 --- a/src/main/scala/xyz/driver/core/app/init.scala +++ b/src/main/scala/xyz/driver/core/app/init.scala @@ -29,6 +29,16 @@ object init { case class ApplicationContext(config: Config, clock: Clock, reporter: ScalaLoggingCompat) { val time: TimeProvider = clock } + object ApplicationContext { + def apply(config: Config, clock: Clock, log0: Logger): ApplicationContext = { + val reporter = new NoTraceReporter with ScalaLoggingCompat { + val logger = log0 + } + ApplicationContext(config, clock, reporter) + } + def apply(config: Config, time: TimeProvider, log0: Logger): ApplicationContext = + ApplicationContext(config, time.toClock, log0) + } /** NOTE: This needs to be the first that is run when application starts. * Otherwise if another command causes the logger to be instantiated, @@ -90,9 +100,7 @@ object init { ApplicationContext( config = getEnvironmentSpecificConfig(), clock = Clock.systemUTC(), - new NoTraceReporter with ScalaLoggingCompat { - val logger = Logger(LoggerFactory.getLogger(classOf[DriverApp])) - } + Logger(LoggerFactory.getLogger(classOf[DriverApp])) ) def createDefaultApplication( -- cgit v1.2.3