journal-remote: initialize writer hashmap before use

https://bugs.freedesktop.org/show_bug.cgi?id=83682

[zj: move the initalization even earlier, before any sockets are
     looked at.]
This commit is contained in:
Jonathan Liu
2014-09-25 18:19:03 -04:00
committed by Zbigniew Jędrzejewski-Szmek
parent 79d80fc146
commit 22259a00fd
+4 -4
View File
@@ -819,6 +819,10 @@ static int remoteserver_init(RemoteServer *s,
assert(server == NULL);
server = s;
r = init_writer_hashmap(s);
if (r < 0)
return r;
n = sd_listen_fds(true);
if (n < 0) {
log_error("Failed to read listening file descriptors from environment: %s",
@@ -942,10 +946,6 @@ static int remoteserver_init(RemoteServer *s,
return -EINVAL;
}
r = init_writer_hashmap(s);
if (r < 0)
return r;
if (arg_split_mode == JOURNAL_WRITE_SPLIT_NONE) {
/* In this case we know what the writer will be
called, so we can create it and verify that we can