From fa031bce9938eda77d46152515ba6a6a827fd897 Mon Sep 17 00:00:00 2001 From: Viktor Klang Date: Sun, 25 Dec 2011 17:45:55 +0100 Subject: [PATCH 1/3] Defaulting the nodename to 'default' --- akka-remote/src/main/scala/akka/remote/Remote.scala | 6 +++--- .../src/main/scala/akka/remote/RemoteExtension.scala | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/akka-remote/src/main/scala/akka/remote/Remote.scala b/akka-remote/src/main/scala/akka/remote/Remote.scala index b1425a2754..276431e808 100644 --- a/akka-remote/src/main/scala/akka/remote/Remote.scala +++ b/akka-remote/src/main/scala/akka/remote/Remote.scala @@ -142,9 +142,9 @@ class RemoteSystemDaemon(system: ActorSystemImpl, remote: Remote, _path: ActorPa val full = Vector() ++ names rec(full.mkString("/"), 0) match { - case (Nobody, _) ⇒ Nobody - case (ref, n) if n == 0 ⇒ ref - case (ref, n) ⇒ ref.getChild(full.takeRight(n).iterator) + case (Nobody, _) ⇒ Nobody + case (ref, 0) ⇒ ref + case (ref, n) ⇒ ref.getChild(full.takeRight(n).iterator) } } diff --git a/akka-remote/src/main/scala/akka/remote/RemoteExtension.scala b/akka-remote/src/main/scala/akka/remote/RemoteExtension.scala index 5c5d41b0d4..9e30a72f81 100644 --- a/akka-remote/src/main/scala/akka/remote/RemoteExtension.scala +++ b/akka-remote/src/main/scala/akka/remote/RemoteExtension.scala @@ -31,7 +31,7 @@ class RemoteSettings(val config: Config, val systemName: String) extends Extensi } val NodeName: String = config.getString("akka.cluster.nodename") match { - case "" ⇒ throw new ConfigurationException("akka.cluster.nodename configuration property must be defined") + case "" ⇒ "undefined" case value ⇒ value } From 2a45291b7dba8cc8b5f35068e47e9a085216309f Mon Sep 17 00:00:00 2001 From: Viktor Klang Date: Sun, 25 Dec 2011 17:51:07 +0100 Subject: [PATCH 2/3] Outputting the node name on startuo --- akka-remote/src/main/scala/akka/remote/Remote.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/akka-remote/src/main/scala/akka/remote/Remote.scala b/akka-remote/src/main/scala/akka/remote/Remote.scala index 276431e808..d9de67c473 100644 --- a/akka-remote/src/main/scala/akka/remote/Remote.scala +++ b/akka-remote/src/main/scala/akka/remote/Remote.scala @@ -111,7 +111,7 @@ class Remote(val settings: ActorSystem.Settings, val remoteSettings: RemoteSetti } } - log.info("Starting remote server on [{}]", remoteAddress) + log.info("Starting remote server on [{}] with node name [{}]", remoteAddress, provider.nodename) } } From a0885f13621357d70cefba4bc3b9811059140594 Mon Sep 17 00:00:00 2001 From: Viktor Klang Date: Mon, 26 Dec 2011 00:22:27 +0100 Subject: [PATCH 3/3] Switching to a default value for the nodename --- akka-remote/src/main/resources/reference.conf | 2 +- akka-remote/src/main/scala/akka/remote/RemoteExtension.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/akka-remote/src/main/resources/reference.conf b/akka-remote/src/main/resources/reference.conf index b1900a237e..fb5b843e17 100644 --- a/akka-remote/src/main/resources/reference.conf +++ b/akka-remote/src/main/resources/reference.conf @@ -128,7 +128,7 @@ akka { cluster { name = "default-cluster" - nodename = "" + nodename = "default" seed-nodes = [] } } diff --git a/akka-remote/src/main/scala/akka/remote/RemoteExtension.scala b/akka-remote/src/main/scala/akka/remote/RemoteExtension.scala index 9e30a72f81..80e870c076 100644 --- a/akka-remote/src/main/scala/akka/remote/RemoteExtension.scala +++ b/akka-remote/src/main/scala/akka/remote/RemoteExtension.scala @@ -31,7 +31,7 @@ class RemoteSettings(val config: Config, val systemName: String) extends Extensi } val NodeName: String = config.getString("akka.cluster.nodename") match { - case "" ⇒ "undefined" + case "" ⇒ throw new ConfigurationException("Configuration option 'akka.cluster.nodename' must be non-empty.") case value ⇒ value }