From f6a7f84ed50637381daf3edc7ece5bc393f8d8ea Mon Sep 17 00:00:00 2001
From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Wed, 20 Aug 2014 13:32:07 +0200
Subject: [PATCH] Revert "Fix external command pipe: Too many open files"

This reverts commit 1a3f7d774c2dce7750103913b2864c3c588b386f.
---
 components/compat/externalcommandlistener.cpp | 18 ++++--------------
 tools/scripts/process_check_result            |  2 +-
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/components/compat/externalcommandlistener.cpp b/components/compat/externalcommandlistener.cpp
index fe25bc4c3..64ec44dfa 100644
--- a/components/compat/externalcommandlistener.cpp
+++ b/components/compat/externalcommandlistener.cpp
@@ -111,7 +111,9 @@ void ExternalCommandListener::CommandPipeThread(const String& commandPath)
 				return;
 			}
 
-			Log(LogDebug, "ExternalCommandListener", "Client connected");
+
+
+			Log(LogNotice, "ExternalCommandListener", "Client connected");
 			Utility::QueueAsyncCallback(boost::bind(&ExternalCommandListener::ClientHandler, this, commandPath, fd));
 		} catch (std::exception&) {
 			Log(LogCritical, "ExternalCommandListener", "Cannot accept new connection.");
@@ -142,19 +144,6 @@ void ExternalCommandListener::ClientHandler(const String& commandPath, int fd)
 
 	String command = line;
 
-	if (command.IsEmpty()) {
-		fclose(fp);
-		return;
-	}
-
-	/* check if line contains [$unixts] */
-	if (line[0] != '[' || line[11] != ']') {
-		Log(LogDebug, "ExternalCommandListener", "Cannot find timestamp prefix in external command '" + command + "'. Bailing out.");
-		delete line;
-		fclose(fp);
-		return;
-	}
-
 	try {
 		Log(LogInformation, "ExternalCommandListener", "Executing external command: " + command);
 
@@ -163,6 +152,7 @@ void ExternalCommandListener::ClientHandler(const String& commandPath, int fd)
 		std::ostringstream msgbuf;
 		msgbuf << "External command failed.";
 		Log(LogWarning, "ExternalCommandListener", msgbuf.str());
+		return;
 	}
 
 	delete line;
diff --git a/tools/scripts/process_check_result b/tools/scripts/process_check_result
index c329c0554..6d01ace0c 100755
--- a/tools/scripts/process_check_result
+++ b/tools/scripts/process_check_result
@@ -89,6 +89,6 @@ else
 fi
 
 echo "Sending '$ECHO $CMDLINE >> $CMDFILE'"
-`$ECHO "$CMDLINE" >> $CMDFILE`
+`$ECHO $CMDLINE >> $CMDFILE`
 
 exit 0