summaryrefslogtreecommitdiff
path: root/src/journal/journald-stream.c
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2015-08-01 19:53:03 -0400
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2015-08-02 14:42:43 -0400
commit15d91bff36c61d38df8edff258d1702a017a0e66 (patch)
treeefb18b107a441ed174d73995d21efefca4036b90 /src/journal/journald-stream.c
parentf89d10ae45107c675adbe02e2b1878ee0f5af5ee (diff)
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.
Diffstat (limited to 'src/journal/journald-stream.c')
-rw-r--r--src/journal/journald-stream.c7
1 files changed, 2 insertions, 5 deletions
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;
}