From 15d91bff36c61d38df8edff258d1702a017a0e66 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Sat, 1 Aug 2015 19:53:03 -0400 Subject: 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. --- src/journal/journald-stream.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/journal/journald-stream.c') 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; } -- cgit v1.2.3-54-g00ecf