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

send dropped system messages to deadLetters

Browse source 
* publish remote lifecycle event for quarantined
This commit is contained in:
Patrik Nordwall 2016-06-08 12:40:40 +02:00
parent 7a1a316e8a
commit 7ce6dffabf
6 changed files with 28 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

8
akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala
View file

@ -497,12 +497,14 @@ private[akka] class RemoteActorRef private[akka] (
@deprecated("Use context.watch(actor) and receive Terminated(actor)", "2.2")
override private[akka] def isTerminated: Boolean = false
private def handleException: Catcher[Unit] = {
private def handleException(message: Any, sender: ActorRef): Catcher[Unit] = {
case e: InterruptedException ⇒
remote.system.eventStream.publish(Error(e, path.toString, getClass, "interrupted during message send"))
remote.system.deadLetters.tell(message, sender)
Thread.currentThread.interrupt()
case NonFatal(e) ⇒
remote.system.eventStream.publish(Error(e, path.toString, getClass, "swallowing exception during message send"))
remote.system.deadLetters.tell(message, sender)
}
/**
@ -529,11 +531,11 @@ private[akka] class RemoteActorRef private[akka] (
provider.remoteWatcher ! RemoteWatcher.UnwatchRemote(watchee, watcher)
case _ ⇒ remote.send(message, OptionVal.None, this)
}
} catch handleException
} catch handleException(message, Actor.noSender)
override def !(message: Any)(implicit sender: ActorRef = Actor.noSender): Unit = {
if (message == null) throw new InvalidMessageException("Message is null")
try remote.send(message, OptionVal(sender), this) catch handleException
try remote.send(message, OptionVal(sender), this) catch handleException(message, sender)
}
override def provider: RemoteActorRefProvider = remote.provider