X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournald-stream.c;h=aba9054b2712482a52b3c8c6b38dbd920640a039;hb=46525bfc020e06609a44670f277aaf23954e7d85;hp=e887f01a49102e90bbe8d89d3dec492a14de59bf;hpb=f9a810bedacf1da7c505c1786a2416d592665926;p=elogind.git

diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c
index e887f01a4..aba9054b2 100644
--- a/src/journal/journald-stream.c
+++ b/src/journal/journald-stream.c
@@ -293,7 +293,7 @@ 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;
+                goto terminate;
         }
 
         l = read(s->fd, s->buffer+s->length, sizeof(s->buffer)-1-s->length);
@@ -303,25 +303,22 @@ 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;
+                goto terminate;
         }
 
         if (l == 0) {
-                r = stdout_stream_scan(s, true);
-                if (r < 0)
-                        goto fail;
-
-                return 0;
+                stdout_stream_scan(s, true);
+                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;
 }
@@ -335,8 +332,10 @@ void stdout_stream_free(StdoutStream *s) {
                 LIST_REMOVE(stdout_stream, s->server->stdout_streams, s);
         }
 
-        if (s->event_source)
+        if (s->event_source) {
+                sd_event_source_set_enabled(s->event_source, SD_EVENT_OFF);
                 s->event_source = sd_event_source_unref(s->event_source);
+        }
 
         if (s->fd >= 0)
                 close_nointr_nofail(s->fd);
@@ -390,7 +389,6 @@ static int stdout_stream_new(sd_event_source *es, int listen_fd, uint32_t revent
         len = sizeof(stream->ucred);
         if (getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &stream->ucred, &len) < 0) {
                 log_error("Failed to determine peer credentials: %m");
-                r = -errno;
                 goto fail;
         }
 
@@ -403,7 +401,6 @@ static int stdout_stream_new(sd_event_source *es, int listen_fd, uint32_t revent
 
         if (shutdown(fd, SHUT_WR) < 0) {
                 log_error("Failed to shutdown writing side of socket: %m");
-                r = -errno;
                 goto fail;
         }
 
@@ -427,7 +424,7 @@ static int stdout_stream_new(sd_event_source *es, int listen_fd, uint32_t revent
 
 fail:
         stdout_stream_free(stream);
-        return r;
+        return 0;
 }
 
 int server_open_stdout_socket(Server *s) {