shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-22 06:50:18 +03:00
Code

Merge pull request #2071 from chaloulo/journal-upload-miss-logs

Browse Source 
journal-upload : Ignore journal event when already in uploading state.
This commit is contained in:
Daniel Mack 2016-01-21 16:23:46 +01:00
commit 390be1c86a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/journal-remote/journal-upload-journal.c
View File

@ -312,6 +312,9 @@ void close_journal_input(Uploader *u) {
static int process_journal_input(Uploader *u, int skip) {
int r;
if (u->uploading)
return 0;
r = sd_journal_next_skip(u->journal, skip);
if (r < 0)
return log_error_errno(r, "Failed to skip to next entry: %m");
@ -349,10 +352,8 @@ static int dispatch_journal_input(sd_event_source *event,
assert(u);
if (u->uploading) {
log_warning("dispatch_journal_input called when uploading, ignoring.");
if (u->uploading)
return 0;
}
log_debug("Detected journal input, checking for new data.");
return check_journal_input(u);