Remove ClusterEventBus and system.eventStream, see #2202

This commit is contained in:
Patrik Nordwall 2012-08-14 15:33:34 +02:00
parent e38dd80f38
commit bc4d8fc7c5
3 changed files with 14 additions and 41 deletions

View file

@ -8,6 +8,7 @@ import scala.concurrent.util.{ Deadline, Duration }
import scala.concurrent.forkjoin.ThreadLocalRandom
import akka.actor.{ Actor, ActorLogging, ActorRef, Address, Cancellable, Props, RootActorPath, PoisonPill, Scheduler }
import akka.actor.Status.Failure
import akka.event.EventStream
import akka.routing.ScatterGatherFirstCompletedRouter
import akka.util.Timeout
import akka.pattern.{ AskTimeoutException, ask, pipe }
@ -125,7 +126,6 @@ private[cluster] trait ClusterEnvironment {
private[cluster] def selfAddress: Address
private[cluster] def scheduler: Scheduler
private[cluster] def seedNodes: IndexedSeq[Address]
private[cluster] def eventBus: ClusterEventBus
private[cluster] def shutdown(): Unit
}
@ -808,17 +808,19 @@ private[cluster] final class ClusterCoreDaemon(environment: ClusterEnvironment)
}
def publishState(): Unit = {
environment.eventBus publish MembershipGossipChanged(latestGossip)
environment.eventBus publish InternalStatsChanged(stats)
eventStream publish MembershipGossipChanged(latestGossip)
eventStream publish InternalStatsChanged(stats)
}
def publishMembers(oldMembers: SortedSet[Member]): Unit = {
val oldMembersStatus = oldMembers.map(m (m.address, m.status))
val newMembersStatus = latestGossip.members.map(m (m.address, m.status))
if (newMembersStatus != oldMembersStatus)
environment.eventBus publish MembersChanged(latestGossip.members)
eventStream publish MembersChanged(latestGossip.members)
}
def eventStream: EventStream = context.system.eventStream
def ping(p: Ping): Unit = sender ! Pong(p)
}