Cleaned up internal API

This commit is contained in:
Jonas Bonér 2011-10-10 14:48:16 +02:00
parent 5fc905cc14
commit e779690aa1
3 changed files with 14 additions and 15 deletions

View file

@ -184,12 +184,12 @@ object DeploymentConfig {
def isHomeNode(homes: Iterable[Home]): Boolean = homes exists (home nodeNameFor(home) == Config.nodename)
def failureDetectorTypeFor(failureDetector: FailureDetector): FailureDetectorType = failureDetector match {
case NoOpFailureDetector FailureDetectorType.NoOpFailureDetector
case NoOpFailureDetector() FailureDetectorType.NoOpFailureDetector
case BannagePeriodFailureDetector(timeToBan) FailureDetectorType.BannagePeriodFailureDetector(timeToBan)
case RemoveConnectionOnFirstFailureFailureDetector FailureDetectorType.RemoveConnectionOnFirstFailureFailureDetector
case RemoveConnectionOnFirstFailureFailureDetector() FailureDetectorType.RemoveConnectionOnFirstFailureFailureDetector
case CustomFailureDetector(implClass) FailureDetectorType.CustomFailureDetector(implClass)
case NoOpFailureDetector FailureDetectorType.NoOp
case NoOpFailureDetector() FailureDetectorType.NoOp
case BannagePeriodFailureDetector(timeToBan) FailureDetectorType.BannagePeriod(timeToBan)
case RemoveConnectionOnFirstFailureFailureDetector FailureDetectorType.RemoveConnectionOnFirstFailure
case RemoveConnectionOnFirstFailureFailureDetector() FailureDetectorType.RemoveConnectionOnFirstFailure
case CustomFailureDetector(implClass) FailureDetectorType.Custom(implClass)
case unknown throw new UnsupportedOperationException("Unknown FailureDetector [" + unknown + "]")
}

View file

@ -19,11 +19,10 @@ sealed trait FailureDetectorType
* @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
*/
object FailureDetectorType {
// TODO shorten names to NoOp, BannagePeriod etc.
case object NoOpFailureDetector extends FailureDetectorType
case object RemoveConnectionOnFirstFailureFailureDetector extends FailureDetectorType
case class BannagePeriodFailureDetector(timeToBan: Duration) extends FailureDetectorType
case class CustomFailureDetector(className: String) extends FailureDetectorType
case object NoOp extends FailureDetectorType
case object RemoveConnectionOnFirstFailure extends FailureDetectorType
case class BannagePeriod(timeToBan: Duration) extends FailureDetectorType
case class Custom(className: String) extends FailureDetectorType
}
sealed trait RouterType

View file

@ -47,10 +47,10 @@ class RemoteActorRefProvider extends ActorRefProvider {
case Some(DeploymentConfig.Deploy(_, _, routerType, nrOfInstances, failureDetectorType, DeploymentConfig.RemoteScope(remoteAddresses)))
val failureDetector = DeploymentConfig.failureDetectorTypeFor(failureDetectorType) match {
case FailureDetectorType.NoOpFailureDetector new NoOpFailureDetector
case FailureDetectorType.RemoveConnectionOnFirstFailureFailureDetector new RemoveConnectionOnFirstFailureFailureDetector
case FailureDetectorType.BannagePeriodFailureDetector(timeToBan) new BannagePeriodFailureDetector(timeToBan)
case FailureDetectorType.CustomFailureDetector(implClass) FailureDetector.createCustomFailureDetector(implClass)
case FailureDetectorType.NoOp new NoOpFailureDetector
case FailureDetectorType.RemoveConnectionOnFirstFailure new RemoveConnectionOnFirstFailureFailureDetector
case FailureDetectorType.BannagePeriod(timeToBan) new BannagePeriodFailureDetector(timeToBan)
case FailureDetectorType.Custom(implClass) FailureDetector.createCustomFailureDetector(implClass)
}
val thisHostname = Remote.address.getHostName