shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-07 09:56:51 +03:00
Code

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

Browse Source
This commit is contained in:
Lennart Poettering 2013-12-11 22:17:15 +01:00
parent b6741478e7
commit 91bf3b3e12
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/journal/journald-stream.c
View File

@ -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;
}