diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-10-02 23:19:00 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-10-02 23:19:00 +0200 |
| commit | 65089b82401cd395786a7987c470056ff3f01151 (patch) | |
| tree | 463f1b2a2bbad0e77520e6abe758cb3f1e7ab604 | |
| parent | 070052aba36e5e90d67141110fdcaf5014e36362 (diff) | |
journal: improve some messages
Indicate that we are ignoring errors, when we ignore them, and log that
at LOG_WARNING level.
Use the right error code for the log message.
| -rw-r--r-- | src/journal/journal-file.c | 5 | ||||
| -rw-r--r-- | src/journal/journald-server.c | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c index e21e4a88f1..085d5f346d 100644 --- a/src/journal/journal-file.c +++ b/src/journal/journal-file.c @@ -2859,8 +2859,7 @@ int journal_file_open_reliably( random_u64()) < 0) return -ENOMEM; - r = rename(fname, p); - if (r < 0) + if (rename(fname, p) < 0) return -errno; /* btrfs doesn't cope well with our write pattern and @@ -2869,7 +2868,7 @@ int journal_file_open_reliably( (void) chattr_path(p, false, FS_NOCOW_FL); (void) btrfs_defrag(p); - log_warning("File %s corrupted or uncleanly shut down, renaming and replacing.", fname); + log_warning_errno(r, "File %s corrupted or uncleanly shut down, renaming and replacing.", fname); return journal_file_open(fname, flags, mode, compress, seal, metrics, mmap_cache, template, ret); } diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c index 3538ddc13f..5c896d22c1 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -202,7 +202,7 @@ void server_fix_perms(Server *s, JournalFile *f, uid_t uid) { r = fchmod(f->fd, 0640); if (r < 0) - log_warning_errno(r, "Failed to fix access mode on %s, ignoring: %m", f->path); + log_warning_errno(errno, "Failed to fix access mode on %s, ignoring: %m", f->path); #ifdef HAVE_ACL if (uid <= SYSTEM_UID_MAX) @@ -350,13 +350,13 @@ void server_sync(Server *s) { if (s->system_journal) { r = journal_file_set_offline(s->system_journal); if (r < 0) - log_error_errno(r, "Failed to sync system journal: %m"); + log_warning_errno(r, "Failed to sync system journal, ignoring: %m"); } ORDERED_HASHMAP_FOREACH_KEY(f, k, s->user_journals, i) { r = journal_file_set_offline(f); if (r < 0) - log_error_errno(r, "Failed to sync user journal: %m"); + log_warning_errno(r, "Failed to sync user journal, ignoring: %m"); } if (s->sync_event_source) { |