Updates and removes log4j specific code

criteo · Sep 18, 2018 · 4d07962 · 4d07962 · BenoitHanotte · Sep 20, 2018
1 parent ab935f6
commit 4d07962
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 105 deletions.
diff --git a/build.sbt b/build.sbt
@@ -199,9 +199,6 @@ lazy val cuttle =
       libraryDependencies ++= Seq(
         "mysql" % "mysql-connector-java" % "6.0.6"
       ),
-      libraryDependencies ++= Seq(
-        "log4j" % "log4j" % "1.2.17" % "provided"
-      ),
       libraryDependencies ++= Seq(
         "org.scalatest" %% "scalatest" % "3.0.1",
         "org.mockito" % "mockito-all" % "1.10.19",

diff --git a/core/src/main/scala/com/criteo/cuttle/Executor.scala b/core/src/main/scala/com/criteo/cuttle/Executor.scala
@@ -871,7 +871,7 @@ class Executor[S <: Scheduling] private[cuttle] (val platforms: Seq[ExecutionPla
 
                   // wrap the execution context so that we can register the name of the thread of each
                   // runnable (and thus future) that will be run by the side effect.
-                  val sideEffectExecutionContext = SideEffectExecutionContext.wrap(runnable => new Runnable {
+                  val sideEffectExecutionContext = SideEffectThreadPool.wrap(runnable => new Runnable {
                       override def run(): Unit = {
                         val tName = Thread.currentThread().getName
                         Executor.threadNamesToStreams.put(tName, streams)
@@ -882,7 +882,7 @@ class Executor[S <: Scheduling] private[cuttle] (val platforms: Seq[ExecutionPla
                           Executor.threadNamesToStreams.remove(tName)
                         }
                       }
-                    })(Implicits.sideEffectExecutionContext)
+                    })(Implicits.sideEffectThreadPool)
 
                   val execution = Execution(
                     id = nextExecutionId,

diff --git a/core/src/main/scala/com/criteo/cuttle/ThreadPools.scala b/core/src/main/scala/com/criteo/cuttle/ThreadPools.scala
@@ -27,9 +27,9 @@ object ThreadPools {
   // dedicated threadpool to start new executions and run user-defined side effects
   sealed trait SideEffectThreadPool extends WrappedThreadPool with Metrics
 
-  object SideEffectExecutionContext {
-    def wrap(wrapRunnable: Runnable => Runnable)(implicit executionContext: SideEffectExecutionContext): SideEffectExecutionContext = {
-      new SideEffectExecutionContext {
+  object SideEffectThreadPool {
+    def wrap(wrapRunnable: Runnable => Runnable)(implicit executionContext: SideEffectThreadPool): SideEffectThreadPool = {
+      new SideEffectThreadPool {
         private val delegate = executionContext.underlying
 
         override val underlying: ExecutionContext = new ExecutionContext {

diff --git a/core/src/main/scala/com/criteo/cuttle/log/ExecutionStreamsAppender.scala b/core/src/main/scala/com/criteo/cuttle/log/ExecutionStreamsAppender.scala
diff --git a/examples/src/main/scala/com/criteo/cuttle/examples/HelloWorldSLF4J.scala b/examples/src/main/scala/com/criteo/cuttle/examples/HelloWorldSLF4J.scala