systemctl: introduce -r switch to show units running in local containers in addition...

[elogind.git] / src / journal / journald-stream.c

diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c
index c032ee4a0ef2c2fd66f72cc05171bb36c29fb3f8..c46ffe5d455e0345b55f805c49f1255a6ecf5361 100644 (file)
--- a/src/journal/journald-stream.c
+++ b/src/journal/journald-stream.c
@@ -35,6 +35,7 @@
 #include "journald-syslog.h"
 #include "journald-kmsg.h"
 #include "journald-console.h"
+#include "journald-wall.h"
 
 #define STDOUT_STREAMS_MAX 4096
 
@@ -106,6 +107,9 @@ static int stdout_stream_log(StdoutStream *s, const char *p) {
         if (s->forward_to_console || s->server->forward_to_console)
                 server_forward_console(s->server, priority, s->identifier, p, &s->ucred);
 
+        if (s->server->forward_to_wall)
+                server_forward_wall(s->server, priority, s->identifier, p, &s->ucred);
+
         IOVEC_SET_STRING(iovec[n++], "_TRANSPORT=stdout");
 
         syslog_priority[strlen("PRIORITY=")] = '0' + LOG_PRI(priority);
@@ -403,7 +407,7 @@ static int stdout_stream_new(sd_event_source *es, int listen_fd, uint32_t revent
                 goto fail;
         }
 
-        r = sd_event_add_io(s->event, fd, EPOLLIN, stdout_stream_process, stream, &stream->event_source);
+        r = sd_event_add_io(s->event, &stream->event_source, fd, EPOLLIN, stdout_stream_process, stream);
         if (r < 0) {
                 log_error("Failed to add stream to event loop: %s", strerror(-r));
                 goto fail;
@@ -460,7 +464,7 @@ int server_open_stdout_socket(Server *s) {
         } else
                 fd_nonblock(s->stdout_fd, 1);
 
-        r = sd_event_add_io(s->event, s->stdout_fd, EPOLLIN, stdout_stream_new, s, &s->stdout_event_source);
+        r = sd_event_add_io(s->event, &s->stdout_event_source, s->stdout_fd, EPOLLIN, stdout_stream_new, s);
         if (r < 0) {
                 log_error("Failed to add stdout server fd to event source: %s", strerror(-r));
                 return r;