Merge pull request #188 from jboner/wip-1564-default-nodename-√

Wip 1564 default nodename √
This commit is contained in:
viktorklang 2011-12-26 14:37:29 -08:00
commit f2e1b7d4da
3 changed files with 6 additions and 6 deletions

View file

@ -128,7 +128,7 @@ akka {
cluster {
name = "default-cluster"
nodename = ""
nodename = "default"
seed-nodes = []
}
}

View file

@ -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)
}
}
@ -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)
}
}

View file

@ -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 "" throw new ConfigurationException("Configuration option 'akka.cluster.nodename' must be non-empty.")
case value value
}