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: also consider audit fields with '-' valid
[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 fc095c3635c81c685443f8920cabbb7c4e22e65d..9f13ffdbfe2c086b8b412c7148bd0e0021c8b730 100644
(file)
--- a/
src/journal-remote/journal-upload.c
+++ b/
src/journal-remote/journal-upload.c
@@
-162,11
+162,14
@@
static int load_cursor_state(Uploader *u) {
"LAST_CURSOR", &u->last_cursor,
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;
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;
}
return 0;
}
@@
-837,6
+840,12
@@
int main(int argc, char **argv) {
"STATUS=Processing input...");
while (true) {
"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 (use_journal) {
if (!u.journal)
break;
@@
-852,12
+861,6
@@
int main(int argc, char **argv) {
if (r < 0)
goto cleanup;
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)
if (u.uploading) {
r = perform_upload(&u);
if (r < 0)
@@
-879,5
+882,5
@@
cleanup:
destroy_uploader(&u);
finish:
destroy_uploader(&u);
finish:
- return r
=
= 0 ? EXIT_SUCCESS : EXIT_FAILURE;
+ return r
>
= 0 ? EXIT_SUCCESS : EXIT_FAILURE;
}
}