#include "util.h"
#include "build.h"
#include "fileio.h"
+#include "mkdir.h"
#include "conf-parser.h"
#include "journal-upload.h"
#define STATE_FILE "/var/lib/systemd/journal-upload/state"
#define easy_setopt(curl, opt, value, level, cmd) \
- { \
+ do { \
code = curl_easy_setopt(curl, opt, value); \
if (code) { \
log_full(level, \
curl_easy_strerror(code)); \
cmd; \
} \
- }
+ } while(0)
static size_t output_callback(char *buf,
size_t size,
return size * nmemb;
}
+static int check_cursor_updating(Uploader *u) {
+ _cleanup_free_ char *temp_path = NULL;
+ _cleanup_fclose_ FILE *f = NULL;
+ int r;
+
+ if (!u->state_file)
+ return 0;
+
+ r = mkdir_parents(u->state_file, 0755);
+ if (r < 0) {
+ log_error("Cannot create parent directory of state file %s: %s",
+ u->state_file, strerror(-r));
+ return r;
+ }
+
+ r = fopen_temporary(u->state_file, &f, &temp_path);
+ if (r < 0) {
+ log_error("Cannot save state to %s: %s",
+ u->state_file, strerror(-r));
+ return r;
+ }
+ unlink(temp_path);
+
+ return 0;
+}
+
static int update_cursor_state(Uploader *u) {
_cleanup_free_ char *temp_path = NULL;
_cleanup_fclose_ FILE *f = NULL;
"LAST_CURSOR", &u->last_cursor,
NULL);
- if (r < 0 && r != -ENOENT) {
+ if (r == -ENOENT)
+ log_debug("State file %s is not present.", u->state_file);
+ else if (r < 0) {
log_error("Failed to read state file %s: %s",
u->state_file, strerror(-r));
return r;
- }
+ } else
+ log_debug("Last cursor was %s", u->last_cursor);
return 0;
}
LOG_ERR, return -EXFULL);
}
- if (arg_trust || startswith(u->url, "https://"))
+ if (streq_ptr(arg_trust, "all"))
+ easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0,
+ LOG_ERR, return -EUCLEAN);
+ else if (arg_trust || startswith(u->url, "https://"))
easy_setopt(curl, CURLOPT_CAINFO, arg_trust ?: TRUST_FILE,
LOG_ERR, return -EXFULL);
code = curl_easy_perform(u->easy);
if (code) {
- log_error("Upload to %s failed: %.*s",
- u->url,
- u->error[0] ? (int) sizeof(u->error) : INT_MAX,
- u->error[0] ? u->error : curl_easy_strerror(code));
+ if (u->error[0])
+ log_error("Upload to %s failed: %.*s",
+ u->url, (int) sizeof(u->error), u->error);
+ else
+ log_error("Upload to %s failed: %s",
+ u->url, curl_easy_strerror(code));
return -EIO;
}
sd_event_set_watchdog(u.events, true);
+ r = check_cursor_updating(&u);
+ if (r < 0)
+ goto cleanup;
+
log_debug("%s running as pid "PID_FMT,
program_invocation_short_name, getpid());
"STATUS=Processing input...");
while (true) {
+ r = sd_event_get_state(u.events);
+ if (r < 0)
+ break;
+ if (r == SD_EVENT_FINISHED)
+ break;
+
if (use_journal) {
if (!u.journal)
break;
if (r < 0)
goto cleanup;
- r = sd_event_get_state(u.events);
- if (r < 0)
- break;
- if (r == SD_EVENT_FINISHED)
- break;
-
if (u.uploading) {
r = perform_upload(&u);
if (r < 0)
destroy_uploader(&u);
finish:
- return r == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
+ return r >= 0 ? EXIT_SUCCESS : EXIT_FAILURE;
}