diff options
| -rw-r--r-- | qpid/cpp/src/qpid/broker/Broker.cpp | 3 | ||||
| -rw-r--r-- | qpid/cpp/src/qpid/broker/Connection.cpp | 6 | ||||
| -rw-r--r-- | qpid/specs/management-schema.xml | 10 |
3 files changed, 7 insertions, 12 deletions
diff --git a/qpid/cpp/src/qpid/broker/Broker.cpp b/qpid/cpp/src/qpid/broker/Broker.cpp index d07517fee2..a56b2bd392 100644 --- a/qpid/cpp/src/qpid/broker/Broker.cpp +++ b/qpid/cpp/src/qpid/broker/Broker.cpp @@ -349,8 +349,7 @@ Manageable::status_t Broker::ManagementMethod (uint32_t methodId, status = Manageable::STATUS_OK; break; } - case management::Broker::METHOD_JOINCLUSTER : - case management::Broker::METHOD_LEAVECLUSTER : + default: status = Manageable::STATUS_NOT_IMPLEMENTED; break; } diff --git a/qpid/cpp/src/qpid/broker/Connection.cpp b/qpid/cpp/src/qpid/broker/Connection.cpp index 4be831a9cb..5bc3c175b3 100644 --- a/qpid/cpp/src/qpid/broker/Connection.cpp +++ b/qpid/cpp/src/qpid/broker/Connection.cpp @@ -64,9 +64,11 @@ Connection::Connection(ConnectionOutputHandler* out_, Broker& broker_, const std if (parent != 0) { ManagementAgent* agent = ManagementAgent::Singleton::getInstance(); - + + + // TODO set last bool true if system connection if (agent != 0) - mgmtObject = new management::Connection(agent, this, parent, mgmtId, !isLink); + mgmtObject = new management::Connection(agent, this, parent, mgmtId, !isLink,false); agent->addObject(mgmtObject); } } diff --git a/qpid/specs/management-schema.xml b/qpid/specs/management-schema.xml index 5952595997..79dadf8759 100644 --- a/qpid/specs/management-schema.xml +++ b/qpid/specs/management-schema.xml @@ -68,16 +68,9 @@ <property name="connBacklog" type="uint16" access="RO" desc="Connection backlog limit for listening socket"/> <property name="stagingThreshold" type="uint32" access="RO" desc="Broker stages messages over this size to disk"/> <property name="mgmtPubInterval" type="uint16" access="RW" unit="second" min="1" desc="Interval for management broadcasts"/> - <property name="clusterName" type="sstr" access="RO" desc="Name of cluster this server is a member of"/> <property name="version" type="sstr" access="RO" desc="Running software version"/> <property name="dataDir" type="sstr" access="RO" optional="y" desc="Persistent configuration storage location"/> - <method name="joinCluster"> - <arg name="clusterName" dir="I" type="sstr"/> - </method> - - <method name="leaveCluster"/> - <method name="echo" desc="Request a response to test the path to the management broker"> <arg name="sequence" dir="IO" type="uint32" default="0"/> <arg name="body" dir="IO" type="lstr" default=""/> @@ -218,9 +211,10 @@ <property name="vhostRef" type="objId" references="Vhost" access="RC" index="y" parentRef="y"/> <property name="address" type="sstr" access="RC" index="y"/> <property name="incoming" type="bool" access="RC"/> + <property name="SystemConnection" type="bool" access="RC" desc="Infrastucture/ Inter-system connection (Cluster, Federation ,...)"/> <statistic name="closing" type="bool" desc="This client is closing by management request"/> - <statistic name="authIdentity" type="sstr"/> + <statistic name="authIdentity" type="sstr" desc="authId of connection if authentication enabled"/> <statistic name="framesFromClient" type="count64"/> <statistic name="framesToClient" type="count64"/> <statistic name="bytesFromClient" type="count64"/> |