You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2013/10/11 21:14:11 UTC
[07/14] git commit: Expose an async_die method on the ProtocolHandler
interface.
Expose an async_die method on the ProtocolHandler interface.
git-svn-id: https://svn.apache.org/repos/asf/activemq/activemq-apollo/trunk@1508927 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/activemq-apollo/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-apollo/commit/c0ff590d
Tree: http://git-wip-us.apache.org/repos/asf/activemq-apollo/tree/c0ff590d
Diff: http://git-wip-us.apache.org/repos/asf/activemq-apollo/diff/c0ff590d
Branch: refs/heads/trunk
Commit: c0ff590dc8faf883bea214dc46b108c20c8f2213
Parents: 9090300
Author: Hiram R. Chirino <ch...@apache.org>
Authored: Wed Jul 31 15:31:26 2013 +0000
Committer: Hiram R. Chirino <ch...@apache.org>
Committed: Wed Jul 31 15:31:26 2013 +0000
----------------------------------------------------------------------
.../org/apache/activemq/apollo/amqp/AmqpProtocolHandler.scala | 2 ++
.../apache/activemq/apollo/broker/protocol/AnyProtocol.scala | 3 +++
.../org/apache/activemq/apollo/broker/protocol/Protocol.scala | 2 ++
.../apache/activemq/apollo/broker/protocol/UdpProtocol.scala | 1 +
.../activemq/apollo/openwire/OpenwireProtocolHandler.scala | 5 ++++-
.../org/apache/activemq/apollo/stomp/StompProtocolHandler.scala | 4 +++-
6 files changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/c0ff590d/apollo-amqp/src/main/scala/org/apache/activemq/apollo/amqp/AmqpProtocolHandler.scala
----------------------------------------------------------------------
diff --git a/apollo-amqp/src/main/scala/org/apache/activemq/apollo/amqp/AmqpProtocolHandler.scala b/apollo-amqp/src/main/scala/org/apache/activemq/apollo/amqp/AmqpProtocolHandler.scala
index 0f3884d..73935c3 100644
--- a/apollo-amqp/src/main/scala/org/apache/activemq/apollo/amqp/AmqpProtocolHandler.scala
+++ b/apollo-amqp/src/main/scala/org/apache/activemq/apollo/amqp/AmqpProtocolHandler.scala
@@ -145,6 +145,8 @@ class AmqpProtocolHandler extends ProtocolHandler {
case x: Break =>
}
+ def async_die(client_message:String) = async_die("system-error", client_message)
+
private def die[T](error_code: String, msg: String, e: Throwable = null): T = {
if (e != null) {
connection_log.info(e, "AMQP connection '%s' error: %s", security_context.remote_address, msg, e)
http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/c0ff590d/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/AnyProtocol.scala
----------------------------------------------------------------------
diff --git a/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/AnyProtocol.scala b/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/AnyProtocol.scala
index 8af0dff..84e1e81 100644
--- a/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/AnyProtocol.scala
+++ b/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/AnyProtocol.scala
@@ -138,7 +138,10 @@ class AnyProtocolHandler extends ProtocolHandler {
def session_id = null
var config:DetectDTO = _
+ def async_die(client_message:String) = connection.stop(NOOP)
+
override def on_transport_command(command: AnyRef) = {
+ def async_die(client_message:String) = connection.stop(NOOP)
if (!command.isInstanceOf[ProtocolDetected]) {
throw new ProtocolException("Expected a ProtocolDetected object");
http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/c0ff590d/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/Protocol.scala
----------------------------------------------------------------------
diff --git a/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/Protocol.scala b/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/Protocol.scala
index 91a0834..da393cf 100644
--- a/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/Protocol.scala
+++ b/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/Protocol.scala
@@ -85,6 +85,8 @@ trait ProtocolHandler {
def protocol:String
+ def async_die(client_message:String)
+
def session_id: String
var connection:BrokerConnection = null;
http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/c0ff590d/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/UdpProtocol.scala
----------------------------------------------------------------------
diff --git a/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/UdpProtocol.scala b/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/UdpProtocol.scala
index 8d38ed0..463a327 100644
--- a/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/UdpProtocol.scala
+++ b/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/UdpProtocol.scala
@@ -126,6 +126,7 @@ abstract class UdpProtocolHandler extends ProtocolHandler {
def protocol = "udp"
var session_id:String = null
+ def async_die(client_message:String) = null
var buffer_size = 640*1024
var connection_log:Log = _
http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/c0ff590d/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala
----------------------------------------------------------------------
diff --git a/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala b/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala
index 72df39d..52f85cc 100644
--- a/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala
+++ b/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala
@@ -375,12 +375,15 @@ class OpenwireProtocolHandler extends ProtocolHandler {
}
}
- def async_die(msg: String, actual:Command=null):Unit = try {
+ def async_die(msg: String) = async_die(msg, null)
+
+ def async_die(msg: String, actual:Command):Unit = try {
die(msg, actual)
} catch {
case x:Break=>
}
+
/**
* A protocol error that cannot be recovered from. It results in the connections being terminated.
*/
http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/c0ff590d/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala
----------------------------------------------------------------------
diff --git a/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala b/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala
index 9bd8c15..ef33a8c 100644
--- a/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala
+++ b/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala
@@ -834,7 +834,9 @@ class StompProtocolHandler extends ProtocolHandler {
class ProtocolException(msg:String) extends RuntimeException(msg)
class Break extends RuntimeException
- private def async_die(msg:String, e:Throwable=null) = try {
+ def async_die(msg:String) = async_die(msg, null)
+
+ private def async_die(msg:String, e:Throwable) = try {
die(msg, e)
} catch {
case x:Break=>