You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@toree.apache.org by lb...@apache.org on 2016/04/19 23:28:20 UTC
incubator-toree git commit: Updated kernel message relay to ignore
unknown incoming and output messages
Repository: incubator-toree
Updated Branches:
refs/heads/master df997f372 -> 855fb4100
Updated kernel message relay to ignore unknown incoming and output messages
Project: http://git-wip-us.apache.org/repos/asf/incubator-toree/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-toree/commit/855fb410
Tree: http://git-wip-us.apache.org/repos/asf/incubator-toree/tree/855fb410
Diff: http://git-wip-us.apache.org/repos/asf/incubator-toree/diff/855fb410
Branch: refs/heads/master
Commit: 855fb4100b075347e092ec2251c09d2e8784ff49
Parents: df997f3
Author: Chip Senkbeil <ch...@gmail.com>
Authored: Tue Apr 19 14:12:51 2016 -0500
Committer: Chip Senkbeil <ch...@gmail.com>
Committed: Tue Apr 19 14:12:51 2016 -0500
----------------------------------------------------------------------
.../protocol/v5/relay/KernelMessageRelay.scala | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/855fb410/kernel/src/main/scala/org/apache/toree/kernel/protocol/v5/relay/KernelMessageRelay.scala
----------------------------------------------------------------------
diff --git a/kernel/src/main/scala/org/apache/toree/kernel/protocol/v5/relay/KernelMessageRelay.scala b/kernel/src/main/scala/org/apache/toree/kernel/protocol/v5/relay/KernelMessageRelay.scala
index 316e74f..e9a36c7 100644
--- a/kernel/src/main/scala/org/apache/toree/kernel/protocol/v5/relay/KernelMessageRelay.scala
+++ b/kernel/src/main/scala/org/apache/toree/kernel/protocol/v5/relay/KernelMessageRelay.scala
@@ -26,9 +26,10 @@ import org.apache.toree.kernel.protocol.v5.content.ShutdownRequest
import org.apache.toree.kernel.protocol.v5.kernel.ActorLoader
import org.apache.toree.kernel.protocol.v5.{KernelMessage, MessageType, _}
import org.apache.toree.utils.MessageLogSupport
+
import scala.collection.immutable.HashMap
import scala.concurrent.duration._
-import scala.util.{Random, Failure, Success}
+import scala.util.{Failure, Random, Success, Try}
/**
* This class is meant to be a relay for send KernelMessages through kernel
@@ -79,7 +80,11 @@ case class KernelMessageRelay(
messageTypeString = incomingSpecialCases(messageTypeString)
}
- relay(MessageType.withName(messageTypeString), kernelMessage)
+ Try(MessageType.withName(messageTypeString)) match {
+ case Success(messageName) => relay(messageName, kernelMessage)
+ case Failure(_) =>
+ logger.warn(s"Ignoring unknown message type: $messageTypeString")
+ }
}
private def outgoingRelay(kernelMessage: KernelMessage) = {
@@ -91,7 +96,11 @@ case class KernelMessageRelay(
messageTypeString = outgoingSpecialCases(messageTypeString)
}
- relay(MessageType.withName(messageTypeString), kernelMessage)
+ Try(MessageType.withName(messageTypeString)) match {
+ case Success(messageName) => relay(messageName, kernelMessage)
+ case Failure(_) =>
+ logger.warn(s"Ignoring unknown message type: $messageTypeString")
+ }
}