From 3cc67aa27e0f2c17633250e2f1b7a2561385be4f Mon Sep 17 00:00:00 2001
From: Ruud Overeem <overeem@astron.nl>
Date: Fri, 27 Apr 2007 12:43:10 +0000
Subject: [PATCH] BugID: 826 Don't close filehandles (for a while), default
initialize APAdmin name and more extensive used of this name.
---
LCS/ACC/ACCbin/src/APAdmin.cc | 1 +
LCS/ACC/ACCbin/src/ApplController.cc | 5 ++++-
LCS/ACC/ACCbin/src/ApplControllerMain.cc | 6 +++---
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/LCS/ACC/ACCbin/src/APAdmin.cc b/LCS/ACC/ACCbin/src/APAdmin.cc
index 1c2fb123616..96ac3bdd229 100644
--- a/LCS/ACC/ACCbin/src/APAdmin.cc
+++ b/LCS/ACC/ACCbin/src/APAdmin.cc
@@ -38,6 +38,7 @@ namespace LOFAR {
// Socket is attached to the APAdmin.
//
APAdmin::APAdmin(Socket* aSocket) :
+ itsName (""),
itsDHPC (new DH_ProcControl),
itsSocket (aSocket),
itsBytesToRead (0),
diff --git a/LCS/ACC/ACCbin/src/ApplController.cc b/LCS/ACC/ACCbin/src/ApplController.cc
index 15888f3dff0..f75cddd5c52 100644
--- a/LCS/ACC/ACCbin/src/ApplController.cc
+++ b/LCS/ACC/ACCbin/src/ApplController.cc
@@ -126,7 +126,7 @@ void ApplController::startupNetwork()
//
void ApplController::handleProcMessage(APAdmin* anAP)
{
- LOG_TRACE_FLOW("ApplController:handleProcMessage()");
+ LOG_TRACE_FLOW_STR("ApplController:handleProcMessage(" << anAP->getName() << ")");
DH_ProcControl* DHProcPtr = anAP->getDH();
PCCmd command = DHProcPtr->getCommand();
@@ -188,6 +188,9 @@ void ApplController::handleProcMessage(APAdmin* anAP)
if (ackOnTime && !successful) {
sendExecutionResult(0, "Nack from process:" + anAP->getName());
}
+ else {
+ sendExecutionResult(0, "Ack from process:" + anAP->getName());
+ }
}
else {
LOG_WARN(formatString(
diff --git a/LCS/ACC/ACCbin/src/ApplControllerMain.cc b/LCS/ACC/ACCbin/src/ApplControllerMain.cc
index d9aeea6febb..431055b9bdb 100644
--- a/LCS/ACC/ACCbin/src/ApplControllerMain.cc
+++ b/LCS/ACC/ACCbin/src/ApplControllerMain.cc
@@ -41,9 +41,9 @@ int main (int argc, char* argv[])
{
// close filedescriptors from our launcher
- for (int f = dup(2); f > 2; --f) {
- close(f);
- }
+// for (int f = dup(2); f > 2; --f) {
+// close(f);
+// }
// Always bring up he logger first
ConfigLocator aCL;
--
GitLab