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

Reformatting and some cleanup of the Cluster.scala code

Browse source
This commit is contained in:
Viktor Klang 2011-05-21 16:55:32 +02:00
parent 2f87da5dd4
commit 00f837418f
1 changed files with 23 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

64
akka-cluster/src/main/scala/akka/cluster/Cluster.scala
View file

@ -227,22 +227,19 @@ object Cluster {
properties = properties + property
}
private def nodename: String = {
val overridden = properties.get("akka.cluster.nodename")
if (overridden.isDefined) overridden.get
else Config.nodename
private def nodename: String = properties.get("akka.cluster.nodename") match {
case Some(uberride) ⇒ uberride
case None ⇒ Config.nodename
}
private def hostname: String = {
val overridden = properties.get("akka.cluster.hostname")
if (overridden.isDefined) overridden.get
else Config.hostname
private def hostname: String = properties.get("akka.cluster.hostname") match {
case Some(uberride) ⇒ uberride
case None ⇒ Config.hostname
}
private def port: Int = {
val overridden = properties.get("akka.cluster.port")
if (overridden.isDefined) overridden.get.toInt
else Config.remoteServerPort
private def port: Int = properties.get("akka.cluster.port") match {
case Some(uberride) ⇒ uberride.toInt
case None ⇒ Config.remoteServerPort
}
val defaultSerializer = new SerializableSerializer
@ -1024,11 +1021,10 @@ class ClusterNode private[akka] (
zkClient.readData(actorRegistryFormatPathFor(uuid), new Stat).asInstanceOf[Serializer]
}
val format = formats.head
if (formats.isEmpty) throw new IllegalStateException("No Serializer found for [%s]".format(actorAddress))
if (formats map (_ == format) exists (_ == false)) throw new IllegalStateException(
"Multiple Serializer classes found for [%s]".format(actorAddress))
format
if (formats.forall(_ == formats.head) == false) throw new IllegalStateException("Multiple Serializer classes found for [%s]".format(actorAddress))
formats.head
}
/**
@ -1126,9 +1122,7 @@ class ClusterNode private[akka] (
}
}
}) match {
case Left(_) ⇒ {
/* do nothing */
}
case Left(_) ⇒ /* do nothing */
case Right(exception) ⇒ throw exception
}
}
@ -1429,23 +1423,15 @@ class ClusterNode private[akka] (
import Cluster._
override def start() {
self.start()
}
override def start(): Unit = self.start()
override def stop() {
self.shutdown()
}
override def stop(): Unit = self.shutdown()
override def disconnect() = self.disconnect()
override def reconnect() {
self.reconnect()
}
override def reconnect(): Unit = self.reconnect()
override def resign() {
self.resign()
}
override def resign(): Unit = self.resign()
override def isConnected = self.isConnected.isOn
@ -1479,15 +1465,11 @@ class ClusterNode private[akka] (
override def getAddressesForActorsInUseOnNode(nodeName: String) = self.addressesForActorsInUseOnNode(nodeName).map(_.toString).toArray
override def setConfigElement(key: String, value: String) {
self.setConfigElement(key, value.getBytes("UTF-8"))
}
override def setConfigElement(key: String, value: String): Unit = self.setConfigElement(key, value.getBytes("UTF-8"))
override def getConfigElement(key: String) = new String(self.getConfigElement(key), "UTF-8")
override def removeConfigElement(key: String) {
self.removeConfigElement(key)
}
override def removeConfigElement(key: String): Unit = self.removeConfigElement(key)
override def getConfigElementKeys = self.getConfigElementKeys.toArray
}
@ -1664,8 +1646,8 @@ class RemoteClusterDaemon(cluster: ClusterNode) extends Actor {
self.dispatcher = functionServerDispatcher
def receive = {
case t: Tuple2[Function1[Any, Unit], Any] ⇒ try {
t._1(t._2)
case (fun: Function[Any, Unit], param: Any) ⇒ try {
fun(param)
} finally {
self.stop()
}
@ -1677,8 +1659,8 @@ class RemoteClusterDaemon(cluster: ClusterNode) extends Actor {
self.dispatcher = functionServerDispatcher
def receive = {
case t: Tuple2[Function1[Any, Any], Any] ⇒ try {
self.reply(t._1(t._2))
case (fun: Function[Any, Unit], param: Any) ⇒ try {
self.reply(fun(param))
} finally {
self.stop()
}