X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournald-server.c;h=c28aba8fd00039f36a20eb24e90c5f0d2c631f95;hb=2678031a179a9b91fc799f8ef951a548c66c4b49;hp=019c3a649acae87f7dfd68292e479e3af701b4ab;hpb=aba843317d8acc4634417becebaedcfe5805d49d;p=elogind.git diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c index 019c3a649..c28aba8fd 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -318,6 +318,7 @@ static int do_rotate( log_error_errno(r, "Failed to create new %s journal: %m", name); else server_fix_perms(s, *f, uid); + return r; } @@ -466,7 +467,8 @@ static bool shall_try_append_again(JournalFile *f, int r) { -EPROTONOSUPPORT Unsupported feature -EBADMSG Corrupted -ENODATA Truncated - -ESHUTDOWN Already archived */ + -ESHUTDOWN Already archived + -EIDRM Journal file has been deleted */ if (r == -E2BIG || r == -EFBIG || r == -EDQUOT || r == -ENOSPC) log_debug("%s: Allocation limit reached, rotating.", f->path); @@ -480,6 +482,8 @@ static bool shall_try_append_again(JournalFile *f, int r) { log_warning("%s: Journal file corrupted, rotating.", f->path); else if (r == -EIO) log_warning("%s: IO error, rotating.", f->path); + else if (r == -EIDRM) + log_warning("%s: Journal file has been deleted, rotating.", f->path); else return false;