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

Private all the things

Browse source
This commit is contained in:
Christopher Batey 2018-09-20 12:49:37 +01:00
parent 79c6320bfc
commit 58330ad03e
2 changed files with 10 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

1
akka-actor-typed-tests/src/test/scala/akka/actor/typed/SupervisionSpec.scala
View file

@ -820,7 +820,6 @@ class SupervisionSpec extends ScalaTestWithActorTestKit(
actor ! "give me stacktrace" actor ! "give me stacktrace"
val stacktrace = probe.expectMessageType[Vector[StackTraceElement]] val stacktrace = probe.expectMessageType[Vector[StackTraceElement]]
stacktrace.foreach(println)
stacktrace.count(_.toString.startsWith("akka.actor.typed.internal.SimpleSupervisor.aroundReceive")) should ===(2) stacktrace.count(_.toString.startsWith("akka.actor.typed.internal.SimpleSupervisor.aroundReceive")) should ===(2)
} }

26
akka-actor-typed/src/main/scala/akka/actor/typed/internal/Supervision.scala
View file

@ -37,7 +37,7 @@ import scala.util.control.NonFatal
} }
} }
abstract class AbstractSupervisor[O, I, Thr <: Throwable](ss: SupervisorStrategy)(implicit ev: ClassTag[Thr]) extends BehaviorInterceptor[O, I] { private abstract class AbstractSupervisor[O, I, Thr <: Throwable](strategy: SupervisorStrategy)(implicit ev: ClassTag[Thr]) extends BehaviorInterceptor[O, I] {
private val throwableClass = implicitly[ClassTag[Thr]].runtimeClass private val throwableClass = implicitly[ClassTag[Thr]].runtimeClass
@ -61,7 +61,7 @@ abstract class AbstractSupervisor[O, I, Thr <: Throwable](ss: SupervisorStrategy
} }
def log(ctx: ActorContext[_], t: Throwable): Unit = { def log(ctx: ActorContext[_], t: Throwable): Unit = {
if (ss.loggingEnabled) { if (strategy.loggingEnabled) {
ctx.asScala.log.error(t, "Supervisor [{}] saw failure: {}", this, t.getMessage) ctx.asScala.log.error(t, "Supervisor [{}] saw failure: {}", this, t.getMessage)
} }
} }
@ -74,7 +74,7 @@ abstract class AbstractSupervisor[O, I, Thr <: Throwable](ss: SupervisorStrategy
/** /**
* For cases where O == I for BehaviorInterceptor. * For cases where O == I for BehaviorInterceptor.
*/ */
abstract class SimpleSupervisor[T, Thr <: Throwable: ClassTag](ss: SupervisorStrategy) extends AbstractSupervisor[T, T, Thr](ss) { private abstract class SimpleSupervisor[T, Thr <: Throwable: ClassTag](ss: SupervisorStrategy) extends AbstractSupervisor[T, T, Thr](ss) {
override def aroundReceive(ctx: ActorContext[T], msg: T, target: BehaviorInterceptor.ReceiveTarget[T]): Behavior[T] = { override def aroundReceive(ctx: ActorContext[T], msg: T, target: BehaviorInterceptor.ReceiveTarget[T]): Behavior[T] = {
try { try {
@ -96,7 +96,7 @@ abstract class SimpleSupervisor[T, Thr <: Throwable: ClassTag](ss: SupervisorStr
handleException(ctx) handleException(ctx)
} }
class StopSupervisor[T, Thr <: Throwable: ClassTag](initial: Behavior[T], strategy: Stop) extends SimpleSupervisor[T, Thr](strategy) { private class StopSupervisor[T, Thr <: Throwable: ClassTag](initial: Behavior[T], strategy: Stop) extends SimpleSupervisor[T, Thr](strategy) {
override def handleException(ctx: ActorContext[T]): Catcher[Behavior[T]] = { override def handleException(ctx: ActorContext[T]): Catcher[Behavior[T]] = {
case NonFatal(t: Thr) ⇒ case NonFatal(t: Thr) ⇒
log(ctx, t) log(ctx, t)
@ -104,7 +104,7 @@ class StopSupervisor[T, Thr <: Throwable: ClassTag](initial: Behavior[T], strate
} }
} }
class ResumeSupervisor[T, Thr <: Throwable: ClassTag](ss: Resume) extends SimpleSupervisor[T, Thr](ss) { private class ResumeSupervisor[T, Thr <: Throwable: ClassTag](ss: Resume) extends SimpleSupervisor[T, Thr](ss) {
override protected def handleException(ctx: ActorContext[T]): Catcher[Behavior[T]] = { override protected def handleException(ctx: ActorContext[T]): Catcher[Behavior[T]] = {
case NonFatal(t: Thr) ⇒ case NonFatal(t: Thr) ⇒
log(ctx, t) log(ctx, t)
@ -112,10 +112,10 @@ class ResumeSupervisor[T, Thr <: Throwable: ClassTag](ss: Resume) extends Simple
} }
} }
class RestartSupervisor[T, Thr <: Throwable](initial: Behavior[T], strategy: Restart)(implicit ev: ClassTag[Thr]) extends SimpleSupervisor[T, Thr](strategy) { private class RestartSupervisor[T, Thr <: Throwable](initial: Behavior[T], strategy: Restart)(implicit ev: ClassTag[Thr]) extends SimpleSupervisor[T, Thr](strategy) {
var restarts = 0 private var restarts = 0
var deadline: OptionVal[Deadline] = OptionVal.None private var deadline: OptionVal[Deadline] = OptionVal.None
private def deadlineHasTimeLeft: Boolean = deadline match { private def deadlineHasTimeLeft: Boolean = deadline match {
case OptionVal.None ⇒ true case OptionVal.None ⇒ true
@ -147,7 +147,6 @@ class RestartSupervisor[T, Thr <: Throwable](initial: Behavior[T], strategy: Res
private def handleException(ctx: ActorContext[T], signalRestart: () ⇒ Unit): Catcher[Behavior[T]] = { private def handleException(ctx: ActorContext[T], signalRestart: () ⇒ Unit): Catcher[Behavior[T]] = {
case NonFatal(t: Thr) ⇒ case NonFatal(t: Thr) ⇒
println(s"ex: $t. $restarts $deadlineHasTimeLeft $strategy")
if (strategy.maxNrOfRetries != -1 && restarts >= strategy.maxNrOfRetries && deadlineHasTimeLeft) { if (strategy.maxNrOfRetries != -1 && restarts >= strategy.maxNrOfRetries && deadlineHasTimeLeft) {
throw t throw t
} else { } else {
@ -170,7 +169,7 @@ class RestartSupervisor[T, Thr <: Throwable](initial: Behavior[T], strategy: Res
} }
} }
class BackoffSupervisor[T, Thr <: Throwable: ClassTag](initial: Behavior[T], b: Backoff) extends AbstractSupervisor[AnyRef, T, Thr](b) { private class BackoffSupervisor[T, Thr <: Throwable: ClassTag](initial: Behavior[T], b: Backoff) extends AbstractSupervisor[AnyRef, T, Thr](b) {
import BackoffSupervisor._ import BackoffSupervisor._
@ -205,9 +204,7 @@ class BackoffSupervisor[T, Thr <: Throwable: ClassTag](initial: Behavior[T], b:
Behaviors.empty Behaviors.empty
} }
case ResetRestartCount(current) ⇒ case ResetRestartCount(current) ⇒
println("Reset restart count: " + current)
if (current == restartCount) { if (current == restartCount) {
println("Resetting")
restartCount = 0 restartCount = 0
} }
Behavior.same Behavior.same
@ -259,10 +256,7 @@ class BackoffSupervisor[T, Thr <: Throwable: ClassTag](initial: Behavior[T], b:
} }
/** private object BackoffSupervisor {
* INTERNAL API
*/
@InternalApi private[akka] object BackoffSupervisor {
/** /**
* Calculates an exponential back off delay. * Calculates an exponential back off delay.
*/ */