From ada5e5a90c25f6ed99497a753547a0d6c28c82a8 Mon Sep 17 00:00:00 2001
From: Ruud Overeem <overeem@astron.nl>
Date: Thu, 12 Feb 2015 08:20:44 +0000
Subject: [PATCH] Task #7342: Better logging.
---
MAC/APL/CEPCU/src/OnlineControl/OnlineControl.cc | 3 ++-
MAC/APL/CEPCU/src/PythonControl/PythonControl.cc | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.cc b/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.cc
index 8ee78b19f65..39213eefb96 100644
--- a/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.cc
+++ b/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.cc
@@ -330,6 +330,7 @@ GCFEvent::TResult OnlineControl::active_state(GCFEvent& event, GCFPortInterface&
Message msg;
if (itsMsgQueue->getMessage(msg, 0.1)) {
string obsIDstr = msg.getXMLvalue("message.header.ids.sasid");
+ LOG_INFO_STR("Received message from task " << obsIDstr);
if (atoi(obsIDstr.c_str()) == itsObsID) {
string result = msg.getXMLvalue("message.payload.task.state");
if (result == "aborted") {
@@ -339,7 +340,7 @@ GCFEvent::TResult OnlineControl::active_state(GCFEvent& event, GCFPortInterface&
LOG_FATAL_STR("Unknown result received from correlator: " << result << " assuming failure!");
itsFeedbackResult = CT_RESULT_PIPELINE_FAILED;
}
- LOG_INFO_STR("Received finish result on messagebus: " << itsFeedbackResult);
+ LOG_INFO_STR("Received '" << result << "' on the messagebus");
itsMsgQueue->ack(msg);
TRAN(OnlineControl::finishing_state);
break;
diff --git a/MAC/APL/CEPCU/src/PythonControl/PythonControl.cc b/MAC/APL/CEPCU/src/PythonControl/PythonControl.cc
index 32234c5b739..a187f0e0712 100644
--- a/MAC/APL/CEPCU/src/PythonControl/PythonControl.cc
+++ b/MAC/APL/CEPCU/src/PythonControl/PythonControl.cc
@@ -529,6 +529,7 @@ GCFEvent::TResult PythonControl::operational_state(GCFEvent& event, GCFPortInter
Message msg;
if (itsMsgQueue->getMessage(msg, 0.1)) {
string obsIDstr = msg.getXMLvalue("message.header.ids.sasid");
+ LOG_INFO_STR("Received message from task " << obsIDstr);
if (atoi(obsIDstr.c_str()) == itsObsID) {
string result = msg.getXMLvalue("message.payload.task.state");
if (result == "aborted") {
@@ -538,7 +539,7 @@ GCFEvent::TResult PythonControl::operational_state(GCFEvent& event, GCFPortInter
LOG_FATAL_STR("Unknown result received from pipeline: " << result << " assuming failure!");
itsFeedbackResult = CT_RESULT_PIPELINE_FAILED;
}
- LOG_INFO_STR("Received finish result on messagebus: " << itsFeedbackResult);
+ LOG_INFO_STR("Received '" << result << "' on the messagebus");
itsMsgQueue->ack(msg);
TRAN(PythonControl::finishing_state);
break;
--
GitLab