summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2008-10-10 16:42:53 +0000
committerAlan Conway <aconway@apache.org>2008-10-10 16:42:53 +0000
commitf042c7b950adcfa1ac9525a94925a7ce741afc50 (patch)
tree67a825ff120fc38d86db6ffd59c0864d896cf020
parent7446a80fca85b828d8da46ef2c085626670bf302 (diff)
downloadqpid-python-f042c7b950adcfa1ac9525a94925a7ce741afc50.tar.gz
Client-side INFO logging for known-broker updates.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@703519 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/cpp/src/qpid/client/ConnectionHandler.cpp2
-rw-r--r--qpid/cpp/src/qpid/client/FailoverListener.cpp9
-rw-r--r--qpid/cpp/src/qpid/client/FailoverListener.h2
3 files changed, 9 insertions, 4 deletions
diff --git a/qpid/cpp/src/qpid/client/ConnectionHandler.cpp b/qpid/cpp/src/qpid/client/ConnectionHandler.cpp
index b2245077e2..5fbe87878a 100644
--- a/qpid/cpp/src/qpid/client/ConnectionHandler.cpp
+++ b/qpid/cpp/src/qpid/client/ConnectionHandler.cpp
@@ -26,6 +26,7 @@
#include "qpid/framing/all_method_bodies.h"
#include "qpid/framing/ClientInvoker.h"
#include "qpid/framing/reply_exceptions.h"
+#include "qpid/log/Helpers.h"
using namespace qpid::client;
using namespace qpid::framing;
@@ -165,6 +166,7 @@ void ConnectionHandler::openOk ( const framing::Array& knownBrokers )
for ( i = knownBrokers.begin(); i != knownBrokers.end(); ++i )
knownBrokersUrls.push_back(Url((*i)->get<std::string>()));
setState(OPEN);
+ QPID_LOG(info, "Known-brokers for connection: " << log::formatList(knownBrokersUrls));
}
diff --git a/qpid/cpp/src/qpid/client/FailoverListener.cpp b/qpid/cpp/src/qpid/client/FailoverListener.cpp
index 3254686d9c..5ca617138c 100644
--- a/qpid/cpp/src/qpid/client/FailoverListener.cpp
+++ b/qpid/cpp/src/qpid/client/FailoverListener.cpp
@@ -21,6 +21,8 @@
#include "FailoverListener.h"
#include "SessionBase_0_10Access.h"
#include "qpid/client/SubscriptionManager.h"
+#include "qpid/log/Statement.h"
+#include "qpid/log/Helpers.h"
namespace qpid {
namespace client {
@@ -67,16 +69,17 @@ FailoverListener::~FailoverListener() {
void FailoverListener::received(Message& msg) {
sys::Mutex::ScopedLock l(lock);
- knowBrokers.clear();
+ knownBrokers.clear();
framing::Array urlArray;
msg.getHeaders().getArray("amq.failover", urlArray);
for (framing::Array::ValueVector::const_iterator i = urlArray.begin(); i < urlArray.end(); ++i )
- knowBrokers.push_back(Url((*i)->get<std::string>()));
+ knownBrokers.push_back(Url((*i)->get<std::string>()));
+ QPID_LOG(info, "Known-brokers update: " << log::formatList(knownBrokers));
}
std::vector<Url> FailoverListener::getKnownBrokers() const {
sys::Mutex::ScopedLock l(lock);
- return knowBrokers;
+ return knownBrokers;
}
}} // namespace qpid::client
diff --git a/qpid/cpp/src/qpid/client/FailoverListener.h b/qpid/cpp/src/qpid/client/FailoverListener.h
index 39bea90bb3..c702fed846 100644
--- a/qpid/cpp/src/qpid/client/FailoverListener.h
+++ b/qpid/cpp/src/qpid/client/FailoverListener.h
@@ -50,7 +50,7 @@ class FailoverListener : public MessageListener {
mutable sys::Mutex lock;
std::auto_ptr<SubscriptionManager> subscriptions;
sys::Thread thread;
- std::vector<Url> knowBrokers;
+ std::vector<Url> knownBrokers;
};
}} // namespace qpid::client