1
0
mirror of https://github.com/systemd/systemd.git synced 2025-03-31 14:50:15 +03:00

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
This commit is contained in:
Yu Watanabe 2016-01-24 15:49:04 +09:00
parent b68f6b0a79
commit d10accb0b1

View File

@ -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;
}