From 83b4417af81df92cb640de1694488156ba29d85f Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Mon, 2 Jul 2007 22:35:33 +0000 Subject: 2007-06-30 * src/qpid/cluster/Cluster.cpp: Refactor - expose 4 handler points for all traffic to/from cluster. Removed HandlerUpdater functionality, separate class. Cluster only deals with membership and connecting the 4 handler points to CPG multicast. * src/tests/cluster.mk: Dropped newgrp ais wrapper scripts, its much simpler if the user just does "newgrp ais" before building. * src/tests/ais_check: Test script to check if users gid is ais and give clear notice if not. * src/tests/Cluster.cpp: Updated for changes to Cluster. * src/qpid/cluster/Cpg.cpp: Better messages for common errors. * Handler.h: Remove nextHandler() minor convenience is outweighted by risk of undetected errors if handlers that expect next() to be set are called when it's not set. * src/qpid/cluster/Cpg.cpp: Added logging. Replaced boost::function with traditional virtual interface (nasty stack traces.) git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@552614 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/cluster/ClusterPluginProvider.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'cpp/src/qpid/cluster/ClusterPluginProvider.cpp') diff --git a/cpp/src/qpid/cluster/ClusterPluginProvider.cpp b/cpp/src/qpid/cluster/ClusterPluginProvider.cpp index 3a09a66b81..d48fbadf7b 100644 --- a/cpp/src/qpid/cluster/ClusterPluginProvider.cpp +++ b/cpp/src/qpid/cluster/ClusterPluginProvider.cpp @@ -18,7 +18,6 @@ #include "qpid/broker/Broker.h" #include "qpid/framing/HandlerUpdater.h" #include "qpid/cluster/Cluster.h" -#include "qpid/cluster/ChannelManager.h" #include "qpid/Plugin.h" #include "qpid/Options.h" @@ -51,12 +50,7 @@ struct ClusterPluginProvider : public PluginProvider { if (broker && !options.clusterName.empty()) { assert(!cluster); // A process can only belong to one cluster. cluster.reset(new Cluster(options.clusterName, broker->getUrl())); - - // Channel manager is both the next handler for the cluster - // and the HandlerUpdater plugin for the broker. - shared_ptr manager(new ChannelManager(cluster)); - cluster->join(manager); - broker->use(manager); + // FIXME aconway 2007-06-29: register HandlerUpdater. } } }; -- cgit v1.2.1