journald: move server_restore_streams out of server_open_stdout_socket

One has little to do with the other, so it's confusing that the second
also calls the first.

1 files changed, 6 insertions, 3 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;