Enabled management, add cluster shutdown command.

Remove dead Handler methods in Cluster.
Fixed SessionException handling in broker, was throwing some SessionExceptions as "unknown exception"


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@698945 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 11 insertions, 2 deletions

diff --git a/cpp/src/qpid/cluster/ClusterHandler.cpp b/cpp/src/qpid/cluster/ClusterHandler.cpp
index 648d40470c..7413f27192 100644
--- a/cpp/src/qpid/cluster/ClusterHandler.cpp
+++ b/cpp/src/qpid/cluster/ClusterHandler.cpp
@@ -19,11 +19,13 @@
  *
  */
 
-#include "qpid/framing/AllInvoker.h"
-
+#include "Cluster.h"
 #include "ClusterHandler.h"
+
 #include "qpid/framing/AMQFrame.h"
+#include "qpid/framing/AllInvoker.h"
 #include "qpid/framing/FieldTable.h"
+#include "qpid/log/Statement.h"
 
 
 
@@ -38,6 +40,7 @@ struct Operations : public framing::AMQP_AllOperations::ClusterHandler {
     void update(const framing::FieldTable& members, uint64_t dumping) { handler.update(member, members, dumping); }
     void dumpRequest(const std::string& url) { handler.dumpRequest(member, url); }
     void ready(const std::string& url) { handler.ready(member, url); }
+    void shutdown() { handler.shutdown(member); }
 };
 
 ClusterHandler::~ClusterHandler() {}
@@ -49,5 +52,11 @@ bool ClusterHandler::invoke(const MemberId& id, framing::AMQFrame& frame) {
     return framing::invoke(ops, *frame.getBody()).wasHandled(); 
 }
 
+void ClusterHandler::shutdown(const MemberId& id) {
+    QPID_LOG(notice, cluster.self << " received shutdown from " << id);
+    cluster.leave();
+}
+
+
 }} // namespace qpid::cluster