[Libreoffice-commits] online.git: Branch 'distro/collabora/cloudsuite-rc1' - loolwsd/IoUtil.cpp

Tor Lillqvist tml at collabora.com
Mon Apr 4 14:11:49 UTC 2016


 loolwsd/IoUtil.cpp |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit d867bde9f8c3e508a0d6d861b8d3035153f36866
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Apr 4 16:40:05 2016 +0300

    Don't output a trace line when nothing to do and nothing is wrong

diff --git a/loolwsd/IoUtil.cpp b/loolwsd/IoUtil.cpp
index f47f454..d7f9edd 100644
--- a/loolwsd/IoUtil.cpp
+++ b/loolwsd/IoUtil.cpp
@@ -302,7 +302,8 @@ int PipeReader::readLine(std::string& line,
         pipe.events = POLLIN;
         pipe.revents = 0;
         const int ready = poll(&pipe, 1, pollTimeoutMs);
-        Log::trace() << "Poll for pipe: " << _name << " returned: " << ready << Log::end;
+        if (ready != 0)
+            Log::trace() << "Poll for pipe: " << _name << " returned: " << ready << Log::end;
         if (ready == 0)
         {
             // Timeout.


More information about the Libreoffice-commits mailing list