Replace akka.actor.timeout with specfic settings. See #1808

* ActorTimeout (akka.actor.timeout) was used to all sorts of things.
* TestKit default-timeout
* TypedActor timeout for non void methods
* Transactor coordinated-timeout
* ZeroMQ new-socket-timeout
* And in various tests
This commit is contained in:
Patrik Nordwall 2012-02-10 16:02:37 +01:00
parent b6b438415e
commit e017aeef08
27 changed files with 283 additions and 193 deletions

View file

@ -187,12 +187,9 @@ private[zeromq] class ConcurrentSocketActor(params: Seq[SocketOption]) extends A
fromConfig getOrElse context.system.dispatcher
}
private val defaultPollTimeout =
Duration(context.system.settings.config.getMilliseconds("akka.zeromq.poll-timeout"), TimeUnit.MILLISECONDS)
private val pollTimeout = {
val fromConfig = params collectFirst { case PollTimeoutDuration(duration) duration }
fromConfig getOrElse defaultPollTimeout
fromConfig getOrElse ZeroMQExtension(context.system).DefaultPollTimeout
}
private def newEventLoop: Option[Promise[PollLifeCycle]] = {