raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Fixed misc stuff after review.

Browse source 
Signed-off-by: Jonas Bonér <jonas@jonasboner.com>
This commit is contained in:
Jonas Bonér 2012-02-04 17:50:11 +01:00
parent ff62a1cf2a
commit f855ff2add
3 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
akka-actor/src/main/scala/akka/AkkaException.scala
View file

@ -8,10 +8,10 @@ import akka.actor.newUuid
import java.net.{ InetAddress, UnknownHostException } import java.net.{ InetAddress, UnknownHostException }
object AkkaException { object AkkaException {
val hostname = try InetAddress.getLocalHost.getHostAddress catch { case e: UnknownHostException ⇒ "unknown" } val hostname = try InetAddress.getLocalHost.getHostAddress catch { case e: UnknownHostException ⇒ "unknown host" }
def toStringWithStackTrace(throwable: Throwable): String = { def toStringWithStackTrace(throwable: Throwable): String = {
if (throwable eq null) "Unknown Exception" if (throwable eq null) "Unknown Throwable: was 'null'"
throwable match { throwable match {
case ae: AkkaException ⇒ ae.toLongString case ae: AkkaException ⇒ ae.toLongString
case e ⇒ "%s:%s\n%s" format (e.getClass.getName, e.getMessage, stackTraceToString(e)) case e ⇒ "%s:%s\n%s" format (e.getClass.getName, e.getMessage, stackTraceToString(e))

3
akka-actor/src/main/scala/akka/routing/Routing.scala
View file

@ -728,6 +728,9 @@ case class ScatterGatherFirstCompletedRouter(nrOfInstances: Int = 0, routees: It
override val resizer: Option[Resizer] = None) override val resizer: Option[Resizer] = None)
extends RouterConfig with ScatterGatherFirstCompletedLike { extends RouterConfig with ScatterGatherFirstCompletedLike {
if (within.length <= 0) throw new IllegalArgumentException(
"[within: Duration] can not be zero or negative, was [" + within + "]")
/** /**
* Constructor that sets nrOfInstances to be created. * Constructor that sets nrOfInstances to be created.
* Java API * Java API

11
akka-remote/src/multi-jvm/scala/akka/remote/AbstractRemoteActorMultiJvmSpec.scala
View file

@ -5,22 +5,25 @@ import com.typesafe.config.{Config, ConfigFactory}
trait AbstractRemoteActorMultiJvmSpec { trait AbstractRemoteActorMultiJvmSpec {
def NrOfNodes: Int def NrOfNodes: Int
def commonConfig: Config def commonConfig: Config
def PortRangeStart = 1990 def PortRangeStart = 1990
def NodeRange = 1 to NrOfNodes
def PortRange = PortRangeStart to NrOfNodes
private[this] val remotes: IndexedSeq[String] = { private[this] val remotes: IndexedSeq[String] = {
val nodesOpt = Option(AkkaRemoteSpec.testNodes).map(_.split(",").toIndexedSeq) val nodesOpt = Option(AkkaRemoteSpec.testNodes).map(_.split(",").toIndexedSeq)
nodesOpt getOrElse IndexedSeq.fill(NrOfNodes)("localhost") nodesOpt getOrElse IndexedSeq.fill(NrOfNodes)("localhost")
} }
val nodeConfigs = ((1 to NrOfNodes).toList zip remotes) map { val nodeConfigs = (NodeRange.toList zip remotes) map {
case (idx, host) => case (port, host) =>
ConfigFactory.parseString(""" ConfigFactory.parseString("""
akka { akka {
remote.netty.hostname="%s" remote.netty.hostname="%s"
remote.netty.port = "%d" remote.netty.port = "%d"
}""".format(host, PortRangeStart + idx, idx)) withFallback commonConfig }""".format(host, PortRangeStart + port, port)) withFallback commonConfig
} }
def akkaSpec(idx: Int) = "AkkaRemoteSpec@%s:%d".format(remotes(idx), PortRangeStart + 1 + idx) def akkaSpec(port: Int) = "AkkaRemoteSpec@%s:%d".format(remotes(port), PortRangeStart + 1 + port)
def akkaURIs(count: Int): String = 0 until count map {idx => "\"akka://" + akkaSpec(idx) + "\""} mkString "," def akkaURIs(count: Int): String = 0 until count map {idx => "\"akka://" + akkaSpec(idx) + "\""} mkString ","
} }