diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-10-18 01:36:58 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-10-23 00:18:42 -0400 |
| commit | 50a0b0717563d08c027a16a896bff8d7754eab9e (patch) | |
| tree | 98d7d9881418f876aadf310e31ada6580fbda4dc /src | |
| parent | 1af719edc5958c01c19204fb68d6fc45c9eea85c (diff) | |
journal-upload: do not require port to be set
Diffstat (limited to 'src')
| -rw-r--r-- | src/journal-remote/journal-upload.c | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/src/journal-remote/journal-upload.c b/src/journal-remote/journal-upload.c index 3937683790..87d6ff7c06 100644 --- a/src/journal-remote/journal-upload.c +++ b/src/journal-remote/journal-upload.c @@ -37,6 +37,7 @@ #define PRIV_KEY_FILE CERTIFICATE_ROOT "/private/journal-upload.pem" #define CERT_FILE CERTIFICATE_ROOT "/certs/journal-upload.pem" #define TRUST_FILE CERTIFICATE_ROOT "/ca/trusted.pem" +#define DEFAULT_PORT 19532 static const char* arg_url; @@ -392,6 +393,7 @@ static int setup_signals(Uploader *u) { static int setup_uploader(Uploader *u, const char *url, const char *state_file) { int r; + const char *host, *proto = ""; assert(u); assert(url); @@ -399,10 +401,24 @@ static int setup_uploader(Uploader *u, const char *url, const char *state_file) memzero(u, sizeof(Uploader)); u->input = -1; - if (!startswith(url, "http://") && !startswith(url, "https://")) - url = strappenda("https://", url); + if (!(host = startswith(url, "http://")) && !(host = startswith(url, "https://"))) { + host = url; + proto = "https://"; + } + + if (strchr(host, ':')) + u->url = strjoin(proto, url, "/upload", NULL); + else { + char *t; + size_t x; - u->url = strappend(url, "/upload"); + t = strdupa(url); + x = strlen(t); + while (x > 0 && t[x - 1] == '/') + t[x - 1] = '\0'; + + u->url = strjoin(proto, t, ":" STRINGIFY(DEFAULT_PORT), "/upload", NULL); + } if (!u->url) return log_oom(); @@ -505,7 +521,8 @@ static void help(void) { "Upload journal events to a remote server.\n\n" " -h --help Show this help\n" " --version Show package version\n" - " -u --url=URL Upload to this address\n" + " -u --url=URL Upload to this address (default port " + STRINGIFY(DEFAULT_PORT) ")\n" " --key=FILENAME Specify key in PEM format (default:\n" " \"" PRIV_KEY_FILE "\")\n" " --cert=FILENAME Specify certificate in PEM format (default:\n" |