diff --git a/akka-cluster/src/main/scala/akka/cluster/Node.scala b/akka-cluster/src/main/scala/akka/cluster/Node.scala index 33c1ad840e..0f324936f3 100644 --- a/akka-cluster/src/main/scala/akka/cluster/Node.scala +++ b/akka-cluster/src/main/scala/akka/cluster/Node.scala @@ -170,8 +170,6 @@ final class ClusterCommandDaemon(system: ActorSystem, node: Node) extends Actor } } -// FIXME create package object with implicit conversion that enables: system.node - /** * Pooled and routed wit N number of configurable instances. * Concurrent access to Node. diff --git a/akka-cluster/src/main/scala/akka/package.scala b/akka-cluster/src/main/scala/akka/package.scala new file mode 100644 index 0000000000..993a12c64f --- /dev/null +++ b/akka-cluster/src/main/scala/akka/package.scala @@ -0,0 +1,20 @@ +/** + * Copyright (C) 2009-2012 Typesafe Inc. + */ + +package akka + +import akka.actor.ActorSystem + +package object cluster { + + /** + * Implicitly creates an augmented [[akka.actor.ActorSystem]] with a method {{{def node: Node}}}. + * + * @param system + * @return An augmented [[akka.actor.ActorSystem]] with a method {{{def node: Node}}}. + */ + implicit def actorSystemWithNodeAccessor(system: ActorSystem) = new { + val node = NodeExtension(system) + } +} diff --git a/akka-cluster/src/test/scala/akka/cluster/AccrualFailureDetectorSpec.scala b/akka-cluster/src/test/scala/akka/cluster/AccrualFailureDetectorSpec.scala index 2e00c72ad1..e867bc834b 100644 --- a/akka-cluster/src/test/scala/akka/cluster/AccrualFailureDetectorSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/AccrualFailureDetectorSpec.scala @@ -5,7 +5,7 @@ import akka.testkit.AkkaSpec import akka.actor.Address class AccrualFailureDetectorSpec extends AkkaSpec(""" - akka.loglevel = "DEBUG" + akka.loglevel = "INFO" """) { "An AccrualFailureDetector" must { diff --git a/akka-cluster/src/test/scala/akka/cluster/LeaderElectionSpec.scala b/akka-cluster/src/test/scala/akka/cluster/LeaderElectionSpec.scala index e3da64cfa0..85587f8780 100644 --- a/akka-cluster/src/test/scala/akka/cluster/LeaderElectionSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/LeaderElectionSpec.scala @@ -15,7 +15,7 @@ import java.net.InetSocketAddress class LeaderElectionSpec extends AkkaSpec(""" akka { - loglevel = "DEBUG" + loglevel = "INFO" actor.debug.lifecycle = on actor.debug.autoreceive = on cluster.failure-detector.threshold = 3 diff --git a/akka-cluster/src/test/scala/akka/cluster/NodeMembershipSpec.scala b/akka-cluster/src/test/scala/akka/cluster/NodeMembershipSpec.scala index 56f053fc6c..ddd773dce8 100644 --- a/akka-cluster/src/test/scala/akka/cluster/NodeMembershipSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/NodeMembershipSpec.scala @@ -44,7 +44,7 @@ class NodeMembershipSpec extends AkkaSpec(""" .withFallback(system.settings.config)) .asInstanceOf[ActorSystemImpl] val remote0 = system0.provider.asInstanceOf[RemoteActorRefProvider] - node0 = new Node(system0) + node0 = system0.node // ======= NODE 1 ======== system1 = ActorSystem("system1", ConfigFactory @@ -60,7 +60,7 @@ class NodeMembershipSpec extends AkkaSpec(""" .withFallback(system.settings.config)) .asInstanceOf[ActorSystemImpl] val remote1 = system1.provider.asInstanceOf[RemoteActorRefProvider] - node1 = new Node(system1) + node1 = system1.node Thread.sleep(10.seconds.dilated.toMillis) @@ -99,7 +99,7 @@ class NodeMembershipSpec extends AkkaSpec(""" .withFallback(system.settings.config)) .asInstanceOf[ActorSystemImpl] val remote2 = system2.provider.asInstanceOf[RemoteActorRefProvider] - node2 = new Node(system2) + node2 = system2.node Thread.sleep(10.seconds.dilated.toMillis)