diff --git a/server/streamreader/process_stream.cpp b/server/streamreader/process_stream.cpp index 1d0926bd..53d1fbf1 100644 --- a/server/streamreader/process_stream.cpp +++ b/server/streamreader/process_stream.cpp @@ -35,7 +35,8 @@ namespace streamreader static constexpr auto LOG_TAG = "ProcessStream"; -ProcessStream::ProcessStream(PcmListener* pcmListener, boost::asio::io_context& ioc, const StreamUri& uri) : PosixStream(pcmListener, ioc, uri) +ProcessStream::ProcessStream(PcmListener* pcmListener, boost::asio::io_context& ioc, const StreamUri& uri) + : PosixStream(pcmListener, ioc, uri), pipe_stderr_(ioc) { params_ = uri_.getQuery("params"); wd_timeout_sec_ = cpt::stoul(uri_.getQuery("wd_timeout", "0")); @@ -104,14 +105,13 @@ void ProcessStream::do_connect() LOG(DEBUG, LOG_TAG) << "Launching: '" << path_ + exe_ << "', with params: '" << params_ << "', in path: '" << path_ << "'\n"; pipe_stdout_ = bp::pipe(); - pipe_stderr_ = bp::pipe(); + pipe_stderr_ = bp::async_pipe(ioc_); // stdout pipe should not block int flags = fcntl(pipe_stdout_.native_source(), F_GETFL, 0); fcntl(pipe_stdout_.native_source(), F_SETFL, flags | O_NONBLOCK); process_ = bp::child(path_ + exe_ + " " + params_, bp::std_out > pipe_stdout_, bp::std_err > pipe_stderr_, bp::start_dir = path_); stream_ = make_unique(ioc_, pipe_stdout_.native_source()); - stream_stderr_ = make_unique(ioc_, pipe_stderr_.native_source()); on_connect(); if (wd_timeout_sec_ > 0) { @@ -147,7 +147,7 @@ void ProcessStream::stderrReadLine() const std::string delimiter = "\n"; auto self(shared_from_this()); boost::asio::async_read_until( - *stream_stderr_, streambuf_stderr_, delimiter, [this, self, delimiter](const std::error_code& ec, std::size_t bytes_transferred) { + pipe_stderr_, streambuf_stderr_, delimiter, [this, self, delimiter](const std::error_code& ec, std::size_t bytes_transferred) { if (ec) { LOG(ERROR, LOG_TAG) << "Error while reading from stderr: " << ec.message() << "\n"; diff --git a/server/streamreader/process_stream.hpp b/server/streamreader/process_stream.hpp index d81eab16..80f68b26 100644 --- a/server/streamreader/process_stream.hpp +++ b/server/streamreader/process_stream.hpp @@ -54,12 +54,11 @@ protected: std::string path_; std::string params_; bp::pipe pipe_stdout_; - bp::pipe pipe_stderr_; + bp::async_pipe pipe_stderr_; bp::child process_; bool logStderr_; boost::asio::streambuf streambuf_stderr_; - std::unique_ptr stream_stderr_; // void worker() override; virtual void stderrReadLine();