Fix missing dependencies for json logging and conditional logging (#97)

* issue #95: fix logging bug 🚑 * issue #95: fix omission 🚑
namely · Sep 16, 2020 · 6ff1b58 · 6ff1b58
1 parent fbee231
commit 6ff1b58
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/code/service/src/main/resources/logback.xml b/code/service/src/main/resources/logback.xml
@@ -13,7 +13,7 @@
     </appender>
 
     <!-- Let us define some env vars -->
-    <variable name="NAMELY_ENV" value="${NAMELY_ENV:-dev}"/>
+    <variable name="DEPLOYMENT_ENV" value="${DEPLOYMENT_ENV:-dev}"/>
     <variable name="LOG_LEVEL" value="${LOG_LEVEL:-DEBUG}"/>
 
     <appender name="ASYNCJSON" class="net.logstash.logback.appender.LoggingEventAsyncDisruptorAppender">
@@ -43,8 +43,8 @@
     <!-- Turn down Slick noise-->
     <logger name="scala.slick" level="ERROR"/>
 
-    <variable name="NAMELY_ENV" value="${NAMELY_ENV:-dev}"/>
-    <if condition='p("NAMELY_ENV").equals("dev")'>
+    <variable name="DEPLOYMENT_ENV" value="${DEPLOYMENT_ENV:-dev}"/>
+    <if condition='p("DEPLOYMENT_ENV").equals("dev")'>
         <then>
             <root level="${LOG_LEVEL}">
                 <appender-ref ref="STDOUT"/>

diff --git a/project/BuildSettings.scala b/project/BuildSettings.scala
@@ -20,6 +20,8 @@ object BuildSettings extends AutoPlugin {
         Dependencies.Compile.KamonBundle,
         Dependencies.Compile.KamonJaeger,
         Dependencies.Compile.KamonPrometheus,
+        Dependencies.Compile.Janino,
+        Dependencies.Compile.LogstashLogback,
         Dependencies.Runtime.LagompbRuntime,
         Dependencies.Test.AkkaGrpcTestkit
       ),

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -11,6 +11,8 @@ object Dependencies {
     val KamonAkkaGrpcVersion: String = "0.0.9"
     val AkkaVersion: String = "2.6.9"
     val KamonVersion: String = "2.1.6"
+    val JaninoVersion: String = "3.1.2"
+    val LogstashLogbackVersion = "6.3"
   }
 
   object Compile {
@@ -22,6 +24,8 @@ object Dependencies {
     val KanelaAgent: ModuleID = "io.kamon" % "kanela-agent" % Versions.KanelaAgentVersion
     val KamonAkkaGrpc: ModuleID =
       ("com.github.nezasa" %% "kamon-akka-grpc" % Versions.KamonAkkaGrpcVersion).intransitive()
+    val Janino = "org.codehaus.janino" % "janino" % Versions.JaninoVersion
+    val LogstashLogback = "net.logstash.logback" % "logstash-logback-encoder" % Versions.LogstashLogbackVersion
   }
 
   object Runtime {