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

Cleanup

Browse source
This commit is contained in:
Viktor Klang 2010-01-14 23:05:26 +01:00
parent 0852eed180
commit 6af106dd1a
4 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

24
akka-core/src/main/scala/remote/Cluster.scala
View file

@ -6,10 +6,9 @@ package se.scalablesolutions.akka.remote
import se.scalablesolutions.akka.Config.config
import se.scalablesolutions.akka.config.ScalaConfig._
import se.scalablesolutions.akka.remote.Cluster.{Node, RelayedMessage}
import se.scalablesolutions.akka.serialization.Serializer
import se.scalablesolutions.akka.actor.{Supervisor, SupervisorFactory, Actor, ActorRegistry}
import se.scalablesolutions.akka.util.Logging
import scala.collection.immutable.{Map, HashMap}
/**
@ -41,18 +40,23 @@ abstract class ClusterActor extends Actor with Cluster {
* <p/>
* Loads a specified ClusterActor and delegates to that instance.
*/
object Cluster extends Cluster {
object Cluster extends Cluster with Logging {
private[remote] sealed trait ClusterMessage
private[remote] case class Node(endpoints: List[RemoteAddress]) extends ClusterMessage
private[remote] case class RelayedMessage(actorClassFQN: String, msg: AnyRef) extends ClusterMessage
private[remote] val clusterActor: Option[ClusterActor] =
config.getString("akka.remote.cluster.actor") map { name =>
val a = Class.forName(name).newInstance.asInstanceOf[ClusterActor]
a.start
a
}
private[remote] val clusterActor: Option[ClusterActor] = {
val name = config.getString("akka.remote.cluster.actor","not defined")
try {
val a = Class.forName(name).newInstance.asInstanceOf[ClusterActor]
a.start
Some(a)
}
catch {
case e => log.error(e,"Couldn't load Cluster provider: [%s]",name)
None
}
}
private[remote] val supervisor: Option[Supervisor] = if (clusterActor.isDefined) {
val sup = SupervisorFactory(