You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2013/02/25 20:43:20 UTC
svn commit: r1449831 - in /qpid/trunk/qpid/cpp/src/qpid/ha: BrokerInfo.cpp
BrokerInfo.h HaBroker.cpp QueueGuard.cpp RemoteBackup.cpp
ReplicatingSubscription.cpp
Author: aconway
Date: Mon Feb 25 19:43:20 2013
New Revision: 1449831
URL: http://svn.apache.org/r1449831
Log:
NO-JIRA: HA loggging: include status in log messages that refer to a BrokerInfo
Modified:
qpid/trunk/qpid/cpp/src/qpid/ha/BrokerInfo.cpp
qpid/trunk/qpid/cpp/src/qpid/ha/BrokerInfo.h
qpid/trunk/qpid/cpp/src/qpid/ha/HaBroker.cpp
qpid/trunk/qpid/cpp/src/qpid/ha/QueueGuard.cpp
qpid/trunk/qpid/cpp/src/qpid/ha/RemoteBackup.cpp
qpid/trunk/qpid/cpp/src/qpid/ha/ReplicatingSubscription.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/ha/BrokerInfo.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/ha/BrokerInfo.cpp?rev=1449831&r1=1449830&r2=1449831&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/ha/BrokerInfo.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/ha/BrokerInfo.cpp Mon Feb 25 19:43:20 2013
@@ -48,15 +48,7 @@ BrokerInfo::BrokerInfo() : port(0), stat
BrokerInfo::BrokerInfo(const types::Uuid& id, BrokerStatus s,
const std::string& host, uint16_t port_) :
hostName(host), port(port_), systemId(id), status(s)
-{
- updateLogId();
-}
-
-void BrokerInfo::updateLogId() {
- std::ostringstream o;
- o << hostName << ":" << port;
- logId = o.str();
-}
+{}
FieldTable BrokerInfo::asFieldTable() const {
Variant::Map m = asMap();
@@ -94,7 +86,6 @@ void BrokerInfo::assign(const Variant::M
hostName = get(m, HOST_NAME).asString();
port = get(m, PORT).asUint16();
status = BrokerStatus(get(m, STATUS).asUint8());
- updateLogId();
}
std::ostream& operator<<(std::ostream& o, const BrokerInfo& b) {
Modified: qpid/trunk/qpid/cpp/src/qpid/ha/BrokerInfo.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/ha/BrokerInfo.h?rev=1449831&r1=1449830&r2=1449831&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/ha/BrokerInfo.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/ha/BrokerInfo.h Mon Feb 25 19:43:20 2013
@@ -53,7 +53,6 @@ class BrokerInfo
std::string getHostName() const { return hostName; }
BrokerStatus getStatus() const { return status; }
uint16_t getPort() const { return port; }
- std::string getLogId() const { return logId; }
void setStatus(BrokerStatus s) { status = s; }
@@ -67,8 +66,6 @@ class BrokerInfo
bool operator<(const BrokerInfo x) const { return systemId < x.systemId; }
private:
- void updateLogId();
- std::string logId;
std::string hostName;
uint16_t port;
types::Uuid systemId;
Modified: qpid/trunk/qpid/cpp/src/qpid/ha/HaBroker.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/ha/HaBroker.cpp?rev=1449831&r1=1449830&r2=1449831&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/ha/HaBroker.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/ha/HaBroker.cpp Mon Feb 25 19:43:20 2013
@@ -70,7 +70,7 @@ HaBroker::HaBroker(broker::Broker& b, co
// otherwise there's a window for a client to connect before we get to
// initialize()
if (settings.cluster) {
- QPID_LOG(debug, role->getLogPrefix() << "Rejecting client connections.");
+ QPID_LOG(debug, "Broker startup, rejecting client connections.");
shared_ptr<broker::ConnectionObserver> excluder(new BackupConnectionExcluder);
observer->setObserver(excluder, "Backup: ");
broker.getConnectionObservers().add(observer);
@@ -93,7 +93,7 @@ void HaBroker::initialize() {
broker.getPort(broker::Broker::TCP_TRANSPORT)
)
);
- QPID_LOG(notice, role->getLogPrefix() << "Initializing: " << membership.getInfo());
+ QPID_LOG(notice, "Initializing: " << membership.getInfo());
// Set up the management object.
ManagementAgent* ma = broker.getManagementAgent();
Modified: qpid/trunk/qpid/cpp/src/qpid/ha/QueueGuard.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/ha/QueueGuard.cpp?rev=1449831&r1=1449830&r2=1449831&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/ha/QueueGuard.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/ha/QueueGuard.cpp Mon Feb 25 19:43:20 2013
@@ -53,7 +53,7 @@ QueueGuard::QueueGuard(broker::Queue& q,
: cancelled(false), queue(q), subscription(0)
{
std::ostringstream os;
- os << "Primary guard " << queue.getName() << "@" << info.getLogId() << ": ";
+ os << "Primary guard " << queue.getName() << "@" << info << ": ";
logPrefix = os.str();
observer.reset(new QueueObserver(*this));
queue.addObserver(observer);
Modified: qpid/trunk/qpid/cpp/src/qpid/ha/RemoteBackup.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/ha/RemoteBackup.cpp?rev=1449831&r1=1449830&r2=1449831&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/ha/RemoteBackup.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/ha/RemoteBackup.cpp Mon Feb 25 19:43:20 2013
@@ -35,9 +35,12 @@ using boost::bind;
RemoteBackup::RemoteBackup(
const BrokerInfo& info, broker::Connection* c
-) : logPrefix("Primary: Remote backup "+info.getLogId()+": "),
- brokerInfo(info), replicationTest(NONE), connection(c), reportedReady(false)
-{}
+) : brokerInfo(info), replicationTest(NONE), connection(c), reportedReady(false)
+{
+ std::ostringstream oss;
+ oss << "Primary: Remote backup " << info << ": ";
+ logPrefix = oss.str();
+}
void RemoteBackup::setCatchupQueues(broker::QueueRegistry& queues, bool createGuards)
{
@@ -100,8 +103,12 @@ std::ostream& operator<<(std::ostream& o
void RemoteBackup::ready(const QueuePtr& q) {
catchupQueues.erase(q);
- QPID_LOG(debug, logPrefix << "Caught up on queue: " << q->getName() << ", "
- << catchupQueues.size() << " remain to catch up");
+ if (catchupQueues.size()) {
+ QPID_LOG(debug, logPrefix << "Caught up on queue: " << q->getName() << ", "
+ << catchupQueues.size() << " remain to catch up");
+ }
+ else
+ QPID_LOG(debug, logPrefix << "Caught up on queue: " << q->getName() );
}
// Called via ConfigurationObserver::queueCreate and from catchupQueue
Modified: qpid/trunk/qpid/cpp/src/qpid/ha/ReplicatingSubscription.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/ha/ReplicatingSubscription.cpp?rev=1449831&r1=1449830&r2=1449831&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/ha/ReplicatingSubscription.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/ha/ReplicatingSubscription.cpp Mon Feb 25 19:43:20 2013
@@ -138,7 +138,7 @@ ReplicatingSubscription::ReplicatingSubs
// Set a log prefix message that identifies the remote broker.
ostringstream os;
- os << "Primary " << queue->getName() << "@" << info.getLogId() << ": ";
+ os << "Primary " << queue->getName() << "@" << info << ": ";
logPrefix = os.str();
// NOTE: Once the guard is attached we can have concurrent
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org