From 6a49efd966bf372e6a6d1f3e5500a9d5017bf14c Mon Sep 17 00:00:00 2001 From: Peter Veentjer Date: Tue, 9 Aug 2011 13:33:10 +0300 Subject: [PATCH] ticket 989 #Allow specifying preferred-nodes of other type than node:/ currently the task has been downscoped to only allow node:name since we need to rethink this part. Metadata is going to make it / it possible to deal with way more nodes --- .../src/main/scala/akka/actor/Deployer.scala | 2 +- .../main/scala/akka/actor/DeploymentConfig.scala | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/akka-actor/src/main/scala/akka/actor/Deployer.scala b/akka-actor/src/main/scala/akka/actor/Deployer.scala index 5a5834d8a6..818bd09de9 100644 --- a/akka-actor/src/main/scala/akka/actor/Deployer.scala +++ b/akka-actor/src/main/scala/akka/actor/Deployer.scala @@ -31,7 +31,7 @@ trait ActorDeployer { */ object Deployer extends ActorDeployer { -// val defaultAddress = Node(Config.nodename) + // val defaultAddress = Node(Config.nodename) lazy val instance: ActorDeployer = { val deployer = if (ClusterModule.isEnabled) ClusterModule.clusterDeployer else LocalDeployer diff --git a/akka-actor/src/main/scala/akka/actor/DeploymentConfig.scala b/akka-actor/src/main/scala/akka/actor/DeploymentConfig.scala index 5ee5b0a870..ff539f57b8 100644 --- a/akka-actor/src/main/scala/akka/actor/DeploymentConfig.scala +++ b/akka-actor/src/main/scala/akka/actor/DeploymentConfig.scala @@ -73,9 +73,9 @@ object DeploymentConfig { // --- Home // -------------------------------- sealed trait Home -// case class Host(hostName: String) extends Home + // case class Host(hostName: String) extends Home case class Node(nodeName: String) extends Home -// case class IP(ipAddress: String) extends Home + // case class IP(ipAddress: String) extends Home // -------------------------------- // --- Replicas @@ -137,12 +137,12 @@ object DeploymentConfig { // -------------------------------- def nodeNameFor(home: Home): String = home match { - case Node(nodename) ⇒ nodename -// case Host("localhost") ⇒ Config.nodename -// case IP("0.0.0.0") ⇒ Config.nodename -// case IP("127.0.0.1") ⇒ Config.nodename -// case Host(hostname) ⇒ throw new UnsupportedOperationException("Specifying preferred node name by 'hostname' is not yet supported. Use the node name like: preferred-nodes = [\"node:node1\"]") -// case IP(address) ⇒ throw new UnsupportedOperationException("Specifying preferred node name by 'IP address' is not yet supported. Use the node name like: preferred-nodes = [\"node:node1\"]") + case Node(nodename) ⇒ nodename + // case Host("localhost") ⇒ Config.nodename + // case IP("0.0.0.0") ⇒ Config.nodename + // case IP("127.0.0.1") ⇒ Config.nodename + // case Host(hostname) ⇒ throw new UnsupportedOperationException("Specifying preferred node name by 'hostname' is not yet supported. Use the node name like: preferred-nodes = [\"node:node1\"]") + // case IP(address) ⇒ throw new UnsupportedOperationException("Specifying preferred node name by 'IP address' is not yet supported. Use the node name like: preferred-nodes = [\"node:node1\"]") } def isHomeNode(homes: Iterable[Home]): Boolean = homes exists (home ⇒ nodeNameFor(home) == Config.nodename)