Merged with current master
This commit is contained in:
commit
bf01045779
144 changed files with 6879 additions and 8250 deletions
|
|
@ -57,8 +57,6 @@ import akka.dispatch.{Await, Dispatchers, Future, PinnedDispatcher}
|
|||
|
||||
/**
|
||||
* JMX MBean for the cluster service.
|
||||
*
|
||||
* @author <a href="http://jonasboner.com">Jonas Bonér</a>
|
||||
*/
|
||||
trait ClusterNodeMBean {
|
||||
|
||||
|
|
@ -140,8 +138,6 @@ trait ClusterNodeMBean {
|
|||
|
||||
/**
|
||||
* Module for the Cluster. Also holds global state such as configuration data etc.
|
||||
*
|
||||
* @author <a href="http://jonasboner.com">Jonas Bonér</a>
|
||||
*/
|
||||
object Cluster {
|
||||
val EMPTY_STRING = "".intern
|
||||
|
|
@ -257,8 +253,6 @@ object Cluster {
|
|||
*
|
||||
* /clusterName/'actor-address-to-uuids'/actorAddress/actorUuid
|
||||
* </pre>
|
||||
*
|
||||
* @author <a href="http://jonasboner.com">Jonas Bonér</a>
|
||||
*/
|
||||
class DefaultClusterNode private[akka] (
|
||||
val nodeAddress: NodeAddress,
|
||||
|
|
@ -1596,9 +1590,6 @@ class DefaultClusterNode private[akka] (
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @author <a href="http://jonasboner.com">Jonas Bonér</a>
|
||||
*/
|
||||
class MembershipChildListener(self: ClusterNode) extends IZkChildListener with ErrorHandler {
|
||||
def handleChildChange(parentPath: String, currentChilds: JList[String]) {
|
||||
withErrorHandler {
|
||||
|
|
@ -1638,9 +1629,6 @@ class MembershipChildListener(self: ClusterNode) extends IZkChildListener with E
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @author <a href="http://jonasboner.com">Jonas Bonér</a>
|
||||
*/
|
||||
class StateListener(self: ClusterNode) extends IZkStateListener {
|
||||
def handleStateChanged(state: KeeperState) {
|
||||
state match {
|
||||
|
|
@ -1666,9 +1654,6 @@ class StateListener(self: ClusterNode) extends IZkStateListener {
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @author <a href="http://jonasboner.com">Jonas Bonér</a>
|
||||
*/
|
||||
trait ErrorHandler {
|
||||
def withErrorHandler[T](body: ⇒ T) = {
|
||||
try {
|
||||
|
|
@ -1681,9 +1666,6 @@ trait ErrorHandler {
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @author <a href="http://jonasboner.com">Jonas Bonér</a>
|
||||
*/
|
||||
object RemoteClusterDaemon {
|
||||
val Address = "akka-cluster-daemon".intern
|
||||
|
||||
|
|
@ -1695,8 +1677,6 @@ object RemoteClusterDaemon {
|
|||
* Internal "daemon" actor for cluster internal communication.
|
||||
*
|
||||
* It acts as the brain of the cluster that responds to cluster events (messages) and undertakes action.
|
||||
*
|
||||
* @author <a href="http://jonasboner.com">Jonas Bonér</a>
|
||||
*/
|
||||
class RemoteClusterDaemon(cluster: ClusterNode) extends Actor {
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue