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

!act #3526 Make SupervisorStrategy.logFailure public

Browse source 
* This change is not source compatible since anyone that has
  overridden logFailure will have compilation error
  "has weaker access privileges; it should be public"
This commit is contained in:
Patrik Nordwall 2013-08-16 16:03:03 +02:00
parent 34eb48565b
commit d4f95d4ab7
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-actor/src/main/scala/akka/actor/FaultHandling.scala
View file

@ -325,7 +325,7 @@ abstract class SupervisorStrategy {
* `Resume` failures are logged at `Warning` level.
* `Stop` and `Restart` failures are logged at `Error` level.
*/
protected def logFailure(context: ActorContext, child: ActorRef, cause: Throwable, decision: Directive): Unit =
def logFailure(context: ActorContext, child: ActorRef, cause: Throwable, decision: Directive): Unit =
if (loggingEnabled) {
val logMessage = cause match {
case e: ActorInitializationException if e.getCause ne null ⇒ e.getCause.getMessage

8
akka-actor/src/main/scala/akka/io/SelectionHandler.scala
View file

@ -93,8 +93,8 @@ private[io] object SelectionHandler {
*/
private[io] final val connectionSupervisorStrategy: SupervisorStrategy =
new OneForOneStrategy()(SupervisorStrategy.stoppingStrategy.decider) {
override protected def logFailure(context: ActorContext, child: ActorRef, cause: Throwable,
decision: SupervisorStrategy.Directive): Unit =
override def logFailure(context: ActorContext, child: ActorRef, cause: Throwable,
decision: SupervisorStrategy.Directive): Unit =
if (cause.isInstanceOf[DeathPactException]) {
try context.system.eventStream.publish {
Logging.Debug(child.path.toString, getClass, "Closed after handler termination")
@ -252,8 +252,8 @@ private[io] class SelectionHandler(settings: SelectionHandlerSettings) extends A
case _: Exception ⇒ SupervisorStrategy.Stop
}
new OneForOneStrategy()(stoppingDecider) {
override protected def logFailure(context: ActorContext, child: ActorRef, cause: Throwable,
decision: SupervisorStrategy.Directive): Unit =
override def logFailure(context: ActorContext, child: ActorRef, cause: Throwable,
decision: SupervisorStrategy.Directive): Unit =
try {
val logMessage = cause match {
case e: ActorInitializationException if e.getCause ne null ⇒ e.getCause.getMessage