diff options
| -rw-r--r-- | src/journal/journald-server.c | 9 | ||||
| -rw-r--r-- | src/journal/journald-stream.c | 7 | ||||
| -rw-r--r-- | src/journal/journald-stream.h | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c index 28b1472ac8..bff4e6f537 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -1561,15 +1561,18 @@ int server_init(Server *s) { } } - r = server_open_stdout_socket(s, fds); - if (r < 0) - return r; + /* Try to restore streams, but don't bother if this fails */ + (void) server_restore_streams(s, fds); if (fdset_size(fds) > 0) { log_warning("%u unknown file descriptors passed, closing.", fdset_size(fds)); fds = fdset_free(fds); } + r = server_open_stdout_socket(s); + if (r < 0) + return r; + r = server_open_syslog_socket(s); if (r < 0) return r; diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c index db2f581972..c038b4cced 100644 --- a/src/journal/journald-stream.c +++ b/src/journal/journald-stream.c @@ -629,7 +629,7 @@ static int stdout_stream_restore(Server *s, const char *fname, int fd) { return 0; } -static int server_restore_streams(Server *s, FDSet *fds) { +int server_restore_streams(Server *s, FDSet *fds) { _cleanup_closedir_ DIR *d = NULL; struct dirent *de; int r; @@ -683,7 +683,7 @@ fail: return log_error_errno(errno, "Failed to read streams directory: %m"); } -int server_open_stdout_socket(Server *s, FDSet *fds) { +int server_open_stdout_socket(Server *s) { int r; assert(s); @@ -719,8 +719,5 @@ int server_open_stdout_socket(Server *s, FDSet *fds) { if (r < 0) return log_error_errno(r, "Failed to adjust priority of stdout server event source: %m"); - /* Try to restore streams, but don't bother if this fails */ - (void) server_restore_streams(s, fds); - return 0; } diff --git a/src/journal/journald-stream.h b/src/journal/journald-stream.h index 94bf955d78..257dce45df 100644 --- a/src/journal/journald-stream.h +++ b/src/journal/journald-stream.h @@ -24,6 +24,6 @@ #include "fdset.h" #include "journald-server.h" -int server_open_stdout_socket(Server *s, FDSet *fds); - +int server_open_stdout_socket(Server *s); +int server_restore_streams(Server *s, FDSet *fds); void stdout_stream_free(StdoutStream *s); |