chiark / gitweb /
journald: handle /proc/kmsg reads returning 0 more nicely
authorLennart Poettering <lennart@poettering.net>
Tue, 3 Jul 2012 10:23:33 +0000 (12:23 +0200)
committerLennart Poettering <lennart@poettering.net>
Tue, 3 Jul 2012 10:23:33 +0000 (12:23 +0200)
src/journal/journald.c

index 08597ae..d2e2fca 100644 (file)
@@ -2148,6 +2148,10 @@ static int server_read_proc_kmsg(Server *s) {
         assert(s->proc_kmsg_fd >= 0);
 
         l = read(s->proc_kmsg_fd, s->proc_kmsg_buffer + s->proc_kmsg_length, sizeof(s->proc_kmsg_buffer) - 1 - s->proc_kmsg_length);
+        if (l == 0) /* the kernel is stupid and in some race
+                     * conditions returns 0 in the middle of the
+                     * stream. */
+                return 0;
         if (l < 0) {
 
                 if (errno == EAGAIN || errno == EINTR)