From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 11 Dec 2013 21:17:15 +0000 (+0100)
Subject: journal: don't go belly up when an stdout/stderr client terminates the connection
X-Git-Tag: v209~1024
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=91bf3b3e124575f6f647bff29766e9d992f55b32

journal: don't go belly up when an stdout/stderr client terminates the connection
---

diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c
index e887f01a4..b2291a260 100644
--- a/src/journal/journald-stream.c
+++ b/src/journal/journald-stream.c
@@ -293,7 +293,8 @@ static int stdout_stream_process(sd_event_source *es, int fd, uint32_t revents,
 
         if ((revents|EPOLLIN|EPOLLHUP) != (EPOLLIN|EPOLLHUP)) {
                 log_error("Got invalid event from epoll for stdout stream: %"PRIx32, revents);
-                return -EIO;
+                r = -EIO;
+                goto terminate;
         }
 
         l = read(s->fd, s->buffer+s->length, sizeof(s->buffer)-1-s->length);
@@ -303,25 +304,23 @@ static int stdout_stream_process(sd_event_source *es, int fd, uint32_t revents,
                         return 0;
 
                 log_warning("Failed to read from stream: %m");
-                goto fail;
+                r = -errno;
+                goto terminate;
         }
 
         if (l == 0) {
                 r = stdout_stream_scan(s, true);
-                if (r < 0)
-                        goto fail;
-
-                return 0;
+                goto terminate;
         }
 
         s->length += l;
         r = stdout_stream_scan(s, false);
         if (r < 0)
-                goto fail;
+                goto terminate;
 
         return 1;
 
-fail:
+terminate:
         stdout_stream_free(s);
         return 0;
 }