shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-10-27 10:25:06 +03:00
Code

journal-remote: fix broken --getter option

Browse Source 
This commit fixes the following broken --getter option:
when systemd-journal-remote is called with --getter option,
it causes the error meesage "Zero sources specified" and
the getter command will not be called.
This commit is contained in:
Yu Watanabe 2016-01-24 15:55:07 +09:00
parent e6b6225e3b
commit 2f1acf6f13
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/journal-remote/journal-remote.c
View File

@ -150,7 +150,7 @@ static int spawn_curl(const char* url) {
return r;
}
static int spawn_getter(const char *getter, const char *url) {
static int spawn_getter(const char *getter) {
int r;
_cleanup_strv_free_ char **words = NULL;
@ -159,10 +159,6 @@ static int spawn_getter(const char *getter, const char *url) {
if (r < 0)
return log_error_errno(r, "Failed to split getter option: %m");
r = strv_extend(&words, url);
if (r < 0)
return log_error_errno(r, "Failed to create command line: %m");
r = spawn_child(words[0], words);
if (r < 0)
log_error_errno(r, "Failed to spawn getter %s: %m", getter);
@ -897,6 +893,17 @@ static int remoteserver_init(RemoteServer *s,
fd);
}
if (arg_getter) {
log_info("Spawning getter %s...", arg_getter);
fd = spawn_getter(arg_getter);
if (fd < 0)
return fd;
r = add_source(s, fd, (char*) arg_output, false);
if (r < 0)
return r;
}
if (arg_url) {
const char *url;
char *hostname, *p;
@ -910,13 +917,8 @@ static int remoteserver_init(RemoteServer *s,
else
url = strdupa(arg_url);
if (arg_getter) {
log_info("Spawning getter %s...", url);
fd = spawn_getter(arg_getter, url);
} else {
log_info("Spawning curl %s...", url);
fd = spawn_curl(url);
}
log_info("Spawning curl %s...", url);
fd = spawn_curl(url);
if (fd < 0)
return fd;