From 65dd973faba4fa33f46e35732787a84fc89fff96 Mon Sep 17 00:00:00 2001
From: Jan Rinze Peterzon <peterzon@astron.nl>
Date: Fri, 30 Jan 2015 14:10:42 +0000
Subject: [PATCH] Task #7342: adapted MessageBus.cc to match MessageBus.h
---
LCS/MessageBus/include/MessageBus/MsgBus.h | 3 ++-
LCS/MessageBus/src/MsgBus.cc | 16 ++++++++--------
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/LCS/MessageBus/include/MessageBus/MsgBus.h b/LCS/MessageBus/include/MessageBus/MsgBus.h
index 223ef09a575..8a6a30ff2b1 100644
--- a/LCS/MessageBus/include/MessageBus/MsgBus.h
+++ b/LCS/MessageBus/include/MessageBus/MsgBus.h
@@ -56,7 +56,7 @@ public:
void ack(qpid::messaging::Message &msg);
void reject(qpid::messaging::Message &msg);
- void addQueue(const std::string &address="testqueue", const std::string &options="; {create: always}");
+ bool addQueue(const std::string &address="testqueue", const std::string &options="; {create: always}");
};
class ToBus
@@ -72,5 +72,6 @@ public:
void send(const std::string &msg);
};
#endif
+}
#endif
diff --git a/LCS/MessageBus/src/MsgBus.cc b/LCS/MessageBus/src/MsgBus.cc
index 7cda238d52e..4e45507b427 100644
--- a/LCS/MessageBus/src/MsgBus.cc
+++ b/LCS/MessageBus/src/MsgBus.cc
@@ -1,12 +1,12 @@
#include "lofar_config.h"
#include <MessageBus/MsgBus.h>
-#include <Common/LofarLogger.h>
+//#include <Common/LofarLogger.h>
#ifdef HAVE_QPID
#include <qpid/types/Exception.h>
#include <qpid/messaging/exceptions.h>
-#include <qpid/messaging/Logger.h>
+//#include <qpid/messaging/Logger.h>
using namespace qpid::messaging;
@@ -38,14 +38,14 @@ namespace LOFAR {
FromBus::~FromBus(void)
{
- if (itsNrMissingACKs)
- LOG_ERROR_STR("Queue " << itsQueueName << " on broker " << itsBrokerName << " has " << itsNrMissingACKs << " messages not ACK'ed ");
+// if (itsNrMissingACKs)
+// LOG_ERROR_STR("Queue " << itsQueueName << " on broker " << itsBrokerName << " has " << itsNrMissingACKs << " messages not ACK'ed ");
}
bool FromBus::getMessage(Message &msg, double timeout) // timeout 0.0 means blocking
{
Receiver next;
- if (session.nextReceiver(next,TimeOutDuration(timeout)))
+ if (itsSession.nextReceiver(next,TimeOutDuration(timeout)))
{
itsNrMissingACKs++;
return next.get(msg);
@@ -91,7 +91,7 @@ namespace LOFAR {
itsConnection.open();
itsSession = itsConnection.createSession();
Address addr(address+options);
- sender = itsSession.createSender(addr);
+ Sender itsSender = itsSession.createSender(addr);
} catch(const qpid::types::Exception &ex) {
THROW(MessageBusException, ex.what());
}
@@ -102,9 +102,9 @@ namespace LOFAR {
void ToBus::send(const std::string &msg)
{
Message tosend(msg);
- sender.send(tosend,true);
+ itsSender.send(tosend,true);
}
} // namespace LOFAR
-#endif
\ No newline at end of file
+#endif
--
GitLab