From d10accb0b1af1950882fd91f19dc7df4b0e11aa6 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sun, 24 Jan 2016 15:49:04 +0900 Subject: journal-remote: output file name is determined by the remote hostname When --url option is specified, e.g. --url='http://some.host:19531/entries' retrieved remote journal entries will be stored to /var/log/journal/remote/remote-some.host.journal --- src/journal-remote/journal-remote.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'src/journal-remote/journal-remote.c') diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c index fa0cc99b89..68237be643 100644 --- a/src/journal-remote/journal-remote.c +++ b/src/journal-remote/journal-remote.c @@ -898,7 +898,8 @@ static int remoteserver_init(RemoteServer *s, } if (arg_url) { - const char *url, *hostname; + const char *url; + char *hostname, *p; if (!strstr(arg_url, "/entries")) { if (endswith(arg_url, "/")) @@ -924,7 +925,15 @@ static int remoteserver_init(RemoteServer *s, startswith(arg_url, "http://") ?: arg_url; - r = add_source(s, fd, (char*) hostname, false); + hostname = strdupa(hostname); + if (!hostname) + return log_oom(); + if ((p = strchr(hostname, '/'))) + *p = '\0'; + if ((p = strchr(hostname, ':'))) + *p = '\0'; + + r = add_source(s, fd, hostname, false); if (r < 0) return r; } -- cgit v1.2.3-54-g00ecf