Skip to content
Snippets Groups Projects
Commit 3cc67aa2 authored by Ruud Overeem's avatar Ruud Overeem
Browse files

BugID: 826

Don't close filehandles (for a while), default initialize APAdmin name and more
extensive used of this name.
parent 5daa859c
No related branches found
No related tags found
No related merge requests found
...@@ -38,6 +38,7 @@ namespace LOFAR { ...@@ -38,6 +38,7 @@ namespace LOFAR {
// Socket is attached to the APAdmin. // Socket is attached to the APAdmin.
// //
APAdmin::APAdmin(Socket* aSocket) : APAdmin::APAdmin(Socket* aSocket) :
itsName (""),
itsDHPC (new DH_ProcControl), itsDHPC (new DH_ProcControl),
itsSocket (aSocket), itsSocket (aSocket),
itsBytesToRead (0), itsBytesToRead (0),
......
...@@ -126,7 +126,7 @@ void ApplController::startupNetwork() ...@@ -126,7 +126,7 @@ void ApplController::startupNetwork()
// //
void ApplController::handleProcMessage(APAdmin* anAP) void ApplController::handleProcMessage(APAdmin* anAP)
{ {
LOG_TRACE_FLOW("ApplController:handleProcMessage()"); LOG_TRACE_FLOW_STR("ApplController:handleProcMessage(" << anAP->getName() << ")");
DH_ProcControl* DHProcPtr = anAP->getDH(); DH_ProcControl* DHProcPtr = anAP->getDH();
PCCmd command = DHProcPtr->getCommand(); PCCmd command = DHProcPtr->getCommand();
...@@ -188,6 +188,9 @@ void ApplController::handleProcMessage(APAdmin* anAP) ...@@ -188,6 +188,9 @@ void ApplController::handleProcMessage(APAdmin* anAP)
if (ackOnTime && !successful) { if (ackOnTime && !successful) {
sendExecutionResult(0, "Nack from process:" + anAP->getName()); sendExecutionResult(0, "Nack from process:" + anAP->getName());
} }
else {
sendExecutionResult(0, "Ack from process:" + anAP->getName());
}
} }
else { else {
LOG_WARN(formatString( LOG_WARN(formatString(
......
...@@ -41,9 +41,9 @@ int main (int argc, char* argv[]) ...@@ -41,9 +41,9 @@ int main (int argc, char* argv[])
{ {
// close filedescriptors from our launcher // close filedescriptors from our launcher
for (int f = dup(2); f > 2; --f) { // for (int f = dup(2); f > 2; --f) {
close(f); // close(f);
} // }
// Always bring up he logger first // Always bring up he logger first
ConfigLocator aCL; ConfigLocator aCL;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment