ExternalCommandListener: Use threads per client connection

fixes #6589

components/compat/externalcommandlistener.cpp

@@ -99,6 +99,7 @@ void ExternalCommandListener::CommandPipeThread(const String& commandPath)
 	for (;;) {
 		int fd;
 
+		try {
 			do {
 				fd = open(commandPath.CStr(), O_RDONLY);
 			} while (fd < 0 && errno == EINTR);
@@ -110,6 +111,18 @@ void ExternalCommandListener::CommandPipeThread(const String& commandPath)
 				return;
 			}
 
+
+
+			Log(LogNotice, "ExternalCommandListener", "Client connected");
+			Utility::QueueAsyncCallback(boost::bind(&ExternalCommandListener::ClientHandler, this, commandPath, fd));
+		} catch (std::exception&) {
+			Log(LogCritical, "ExternalCommandListener", "Cannot accept new connection.");
+		}
+	}
+}
+
+void ExternalCommandListener::ClientHandler(const String& commandPath, int fd)
+{
 	FILE *fp = fdopen(fd, "r");
 
 	if (fp == NULL) {
@@ -127,6 +140,7 @@ void ExternalCommandListener::CommandPipeThread(const String& commandPath)
 		while (strlen(line) > 0 &&
 		    (line[strlen(line) - 1] == '\r' || line[strlen(line) - 1] == '\n'))
 			line[strlen(line) - 1] = '\0';
+	}
 
 	String command = line;
 
@@ -138,11 +152,10 @@ void ExternalCommandListener::CommandPipeThread(const String& commandPath)
 		std::ostringstream msgbuf;
 		msgbuf << "External command failed.";
 		Log(LogWarning, "ExternalCommandListener", msgbuf.str());
-			}
+		return;
 	}
 
 	delete line;
 	fclose(fp);
 }
-}
 #endif /* _WIN32 */

components/compat/externalcommandlistener.hpp

@@ -49,6 +49,7 @@ private:
 	boost::thread m_CommandThread;
 
 	void CommandPipeThread(const String& commandPath);
+        void ClientHandler(const String& commandPath, int fd);
 #endif /* _WIN32 */
 };