raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Moved {AllForOneStrategy, OneForOneStrategy, FaultHandlingStrategy} from 'actor' to 'config'

Browse source
This commit is contained in:
Jonas Bonér 2009-12-15 19:00:10 +01:00
parent a740e66a41
commit 85d73b5419
6 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
akka-actors/src/main/scala/actor/Actor.scala
View file

@ -7,6 +7,7 @@ package se.scalablesolutions.akka.actor
import java.net.InetSocketAddress
import se.scalablesolutions.akka.Config._
import se.scalablesolutions.akka.dispatch._
import se.scalablesolutions.akka.config.{AllForOneStrategy, OneForOneStrategy, FaultHandlingStrategy}
import se.scalablesolutions.akka.config.ScalaConfig._
import se.scalablesolutions.akka.stm.Transaction._
import se.scalablesolutions.akka.stm.TransactionManagement._
@ -48,7 +49,8 @@ case class Restart(reason: AnyRef) extends LifeCycleMessage
case class Exit(dead: Actor, killer: Throwable) extends LifeCycleMessage
case object Kill extends LifeCycleMessage
class ActorKilledException private[akka] (val killed: Actor) extends RuntimeException("Actor [" + killed + "] was killed by a Kill message")
class ActorKilledException private[akka] (val killed: Actor)
extends RuntimeException("Actor [" + killed + "] was killed by a Kill message")
sealed abstract class DispatcherType
object DispatcherType {

1
akka-actors/src/main/scala/actor/Scheduler.scala
View file

@ -16,6 +16,7 @@ package se.scalablesolutions.akka.actor
import java.util.concurrent._
import se.scalablesolutions.akka.config.ScalaConfig._
import se.scalablesolutions.akka.config.{AllForOneStrategy, OneForOneStrategy, FaultHandlingStrategy}
import se.scalablesolutions.akka.util.{Logging}
import org.scala_tools.javautils.Imports._

6
akka-actors/src/main/scala/actor/Supervisor.scala
View file

@ -5,17 +5,13 @@
package se.scalablesolutions.akka.actor
import se.scalablesolutions.akka.config.ScalaConfig._
import se.scalablesolutions.akka.config.{ConfiguratorRepository, Configurator}
import se.scalablesolutions.akka.config.{AllForOneStrategy, OneForOneStrategy, FaultHandlingStrategy, ConfiguratorRepository, Configurator}
import se.scalablesolutions.akka.util.Helpers._
import se.scalablesolutions.akka.util.Logging
import se.scalablesolutions.akka.dispatch.Dispatchers
import java.util.concurrent.ConcurrentHashMap
sealed abstract class FaultHandlingStrategy
case class AllForOneStrategy(maxNrOfRetries: Int, withinTimeRange: Int) extends FaultHandlingStrategy
case class OneForOneStrategy(maxNrOfRetries: Int, withinTimeRange: Int) extends FaultHandlingStrategy
/**
* Abstract base class for all supervisor factories.
* <p>

4
akka-actors/src/main/scala/config/Config.scala
View file

@ -7,6 +7,10 @@ package se.scalablesolutions.akka.config
import se.scalablesolutions.akka.actor.Actor
import se.scalablesolutions.akka.dispatch.MessageDispatcher
sealed abstract class FaultHandlingStrategy
case class AllForOneStrategy(maxNrOfRetries: Int, withinTimeRange: Int) extends FaultHandlingStrategy
case class OneForOneStrategy(maxNrOfRetries: Int, withinTimeRange: Int) extends FaultHandlingStrategy
/**
* Configuration classes - not to be used as messages.
*

3
akka-actors/src/main/scala/dispatch/ExecutorBasedEventDrivenDispatcher.scala
View file

@ -66,6 +66,9 @@ class ExecutorBasedEventDrivenDispatcher(_name: String) extends MessageDispatche
else message.invoke
}
// FIXME try this
// val queue = Collections.synchronizedList(new LinkedList[MessageInvocation])
def dispatch(invocation: MessageInvocation) = if (active) {
executor.execute(new Runnable() {
def run = {

3
akka-amqp/src/main/scala/AMQP.scala
View file

@ -7,7 +7,8 @@ package se.scalablesolutions.akka.amqp
import com.rabbitmq.client.{AMQP => RabbitMQ, _}
import com.rabbitmq.client.ConnectionFactory
import se.scalablesolutions.akka.actor.{OneForOneStrategy, Actor}
import se.scalablesolutions.akka.actor.Actor
import se.scalablesolutions.akka.config.OneForOneStrategy
import se.scalablesolutions.akka.config.ScalaConfig._
import se.scalablesolutions.akka.util.{HashCode, Logging}