chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journal-remote: let user specify just the main part of the url
[elogind.git]
/
src
/
journal-remote
/
journal-upload.c
diff --git
a/src/journal-remote/journal-upload.c
b/src/journal-remote/journal-upload.c
index 680073f4d94c75be6a67648e8499e02963129f6d..c5a3e1907bc4502addf5682f098276b447ba0bb0 100644
(file)
--- a/
src/journal-remote/journal-upload.c
+++ b/
src/journal-remote/journal-upload.c
@@
-396,7
+396,13
@@
static int setup_uploader(Uploader *u, const char *url, const char *state_file)
memzero(u, sizeof(Uploader));
u->input = -1;
memzero(u, sizeof(Uploader));
u->input = -1;
- u->url = url;
+ if (!startswith(url, "http://") && !startswith(url, "https://"))
+ url = strappenda("https://", url);
+
+ u->url = strappend(url, "/upload");
+ if (!u->url)
+ return log_oom();
+
u->state_file = state_file;
r = sd_event_default(&u->events);
u->state_file = state_file;
r = sd_event_default(&u->events);
@@
-424,6
+430,8
@@
static void destroy_uploader(Uploader *u) {
free(u->last_cursor);
free(u->current_cursor);
free(u->last_cursor);
free(u->current_cursor);
+ free(u->url);
+
u->input_event = sd_event_source_unref(u->input_event);
close_fd_input(u);
u->input_event = sd_event_source_unref(u->input_event);
close_fd_input(u);
@@
-479,7
+487,7
@@
static void help(void) {
printf("%s -u URL {FILE|-}...\n\n"
"Upload journal events to a remote server.\n\n"
"Options:\n"
printf("%s -u URL {FILE|-}...\n\n"
"Upload journal events to a remote server.\n\n"
"Options:\n"
- " -
-url=URL
Upload to this address\n"
+ " -
u --url=URL
Upload to this address\n"
" --key=FILENAME Specify key in PEM format\n"
" --cert=FILENAME Specify certificate in PEM format\n"
" --trust=FILENAME Specify CA certificate in PEM format\n"
" --key=FILENAME Specify key in PEM format\n"
" --cert=FILENAME Specify certificate in PEM format\n"
" --trust=FILENAME Specify CA certificate in PEM format\n"