added akka-slf4j api

akka logs to selenate-server.log fixed timeouts
tferega · Jul 3, 2015 · 8de74f5 · 8de74f5
1 parent 24c2444
commit 8de74f5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/code/Client/src/main/java/net/selenate/client/user/ActorBase.java b/code/Client/src/main/java/net/selenate/client/user/ActorBase.java
@@ -28,7 +28,7 @@ public ActorBase(final ActorRef session) {
   protected Object block(final Object req) throws IOException {
     try {
       final Future<Object> future = Patterns.ask(session, req, timeout);
-      final Object result = Await.result(future, timeout.duration());
+      final Object result = Await.result(future, new Timeout(32, TimeUnit.SECONDS).duration());
       return result;
     } catch (final Exception e) {
       throw new IOException(String.format("An error occured while sending the message to remote actor!\nMessage: %s", req.toString()), e);

diff --git a/code/Server/src/main/resources/application.conf b/code/Server/src/main/resources/application.conf
@@ -1,4 +1,5 @@
 akka {
+  event-handlers = ["akka.event.slf4j.Slf4jEventHandler"]
   loglevel = DEBUG
 
   actor {

diff --git a/code/Server/src/main/scala/net/selenate/server/sessions/actions/WaitFor.scala b/code/Server/src/main/scala/net/selenate/server/sessions/actions/WaitFor.scala
@@ -3,7 +3,7 @@ package net.selenate.server.sessions.actions
 import scala.annotation.tailrec
 
 trait WaitFor {
-  private val timeout    = 29000
+  private val timeout    = 25000
   private val resolution = 250
 
   def waitForPredicate[T](predicate: => Option[T]): Option[T] = {

diff --git a/code/project/Dependencies.scala b/code/project/Dependencies.scala
@@ -5,6 +5,7 @@ object Dependencies {
   val akkaVersion = "2.1.2"
   val akkaActor   = "com.typesafe.akka" %% "akka-actor"  % akkaVersion
   val akkaRemote  = "com.typesafe.akka" %% "akka-remote" % akkaVersion
+  val akkaSlf4j    = "com.typesafe.akka" %% "akka-slf4j"  % akkaVersion
 
   val jodaTimeConvert = "org.joda"  % "joda-convert" % "1.3.1"
   val jodaTimeTime    = "joda-time" % "joda-time"    % "2.2"
@@ -30,7 +31,7 @@ object Dependencies {
   val scalaTest  = "org.scalatest"           %% "scalatest"       % "2.2.4"
   val slf4j      = "org.slf4j"               %  "slf4j-api"       % "1.7.5"
 
-  val akka     = Seq(akkaActor, akkaRemote)
+  val akka     = Seq(akkaActor, akkaRemote, akkaSlf4j)
   val jodaTime = Seq(jodaTimeConvert, jodaTimeTime)
   val selenium = Seq(seleniumFirefox, seleniumServer)
   val sikuli   = Seq(sikuliApi, javaCV, openCV, openCVPlatform)