X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fjournal-remote%2Fjournal-upload.c;h=36c0241d029bb8b999b90f8f3badb5cefa4ade66;hp=229bceeb806a4977d9dfe2a2a72de4ce93a80cef;hb=0a1beeb64207eaa88ab9236787b1cbc2f704ae14;hpb=30776485c5bc2d9c356e875f2aee874d22c393b7

diff --git a/src/journal-remote/journal-upload.c b/src/journal-remote/journal-upload.c
index 229bceeb8..36c0241d0 100644
--- a/src/journal-remote/journal-upload.c
+++ b/src/journal-remote/journal-upload.c
@@ -63,7 +63,7 @@ static const char *arg_save_state = NULL;
 #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,                                 \
@@ -71,7 +71,7 @@ static const char *arg_save_state = NULL;
                                   curl_easy_strerror(code));            \
                         cmd;                                            \
                 }                                                       \
-        }
+        } while(0)
 
 static size_t output_callback(char *buf,
                               size_t size,
@@ -147,7 +147,7 @@ static int update_cursor_state(Uploader *u) {
 
 finish:
         if (r < 0)
-                log_error("Failed to save state %s: %s", u->state_file, strerror(-r));
+                log_error_errno(-r, "Failed to save state %s: %m", u->state_file);
 
         return r;
 }
@@ -162,11 +162,14 @@ static int load_cursor_state(Uploader *u) {
                            "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;
 }
@@ -254,7 +257,10 @@ int start_upload(Uploader *u,
                                     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);
 
@@ -369,7 +375,7 @@ static int open_file_for_upload(Uploader *u, const char *filename) {
                                     fd, EPOLLIN, dispatch_fd_input, u);
                 if (r < 0) {
                         if (r != -EPERM || arg_follow > 0) {
-                                log_error("Failed to register input event: %s", strerror(-r));
+                                log_error_errno(-r, "Failed to register input event: %m");
                                 return r;
                         }
 
@@ -453,13 +459,13 @@ static int setup_uploader(Uploader *u, const char *url, const char *state_file)
 
         r = sd_event_default(&u->events);
         if (r < 0) {
-                log_error("sd_event_default failed: %s", strerror(-r));
+                log_error_errno(-r, "sd_event_default failed: %m");
                 return r;
         }
 
         r = setup_signals(u);
         if (r < 0) {
-                log_error("Failed to set up signals: %s", strerror(-r));
+                log_error_errno(-r, "Failed to set up signals: %m");
                 return r;
         }
 
@@ -696,7 +702,7 @@ static int parse_argv(int argc, char *argv[]) {
                 case ARG_FILE:
                         r = glob_extend(&arg_file, optarg);
                         if (r < 0) {
-                                log_error("Failed to add paths: %s", strerror(-r));
+                                log_error_errno(-r, "Failed to add paths: %m");
                                 return r;
                         };
                         break;
@@ -834,6 +840,12 @@ int main(int argc, char **argv) {
                   "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;
@@ -849,12 +861,6 @@ int main(int argc, char **argv) {
                 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)
@@ -863,7 +869,7 @@ int main(int argc, char **argv) {
 
                 r = sd_event_run(u.events, u.timeout);
                 if (r < 0) {
-                        log_error("Failed to run event loop: %s", strerror(-r));
+                        log_error_errno(-r, "Failed to run event loop: %m");
                         break;
                 }
         }
@@ -876,5 +882,5 @@ cleanup:
         destroy_uploader(&u);
 
 finish:
-        return r == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
+        return r >= 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }