picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

journal-remote: make --url option support arbitrary url

Browse source 
Currently, --url option supports the only form like http(s)://some.host:19531.
This commit adds support to call systemd-journal-remote as follwos:
systemd-journal-remote --url='http://some.host:19531'
systemd-journal-remote --url='http://some.host:19531/'
systemd-journal-remote --url='http://some.host:19531/entries'
systemd-journal-remote --url='http://some.host:19531/entries?boot&follow'
The first three example result the same and retrieve all entries.
The last example retrieves only current boot entries and wait new events.
This commit is contained in:
Yu Watanabe 2016-01-24 15:45:47 +09:00
parent 9d5a981398
commit b68f6b0a79
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/journal-remote/journal-remote.c
View file

@ -900,7 +900,14 @@ static int remoteserver_init(RemoteServer *s,
if (arg_url) {
const char *url, *hostname;
url = strjoina(arg_url, "/entries");
if (!strstr(arg_url, "/entries")) {
if (endswith(arg_url, "/"))
url = strjoina(arg_url, "entries");
else
url = strjoina(arg_url, "/entries");
}
else
url = strdupa(arg_url);
if (arg_getter) {
log_info("Spawning getter %s...", url);