diff options
author | Daan De Meyer <daan.j.demeyer@gmail.com> | 2022-11-17 10:25:06 +0100 |
---|---|---|
committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-11-17 22:16:18 +0900 |
commit | f9fbac8b1fa23392f8ff8f2d8284676ed72f0138 (patch) | |
tree | d7bde254174a7bc96a79ca9589b96d73122ee1c2 /src/journal | |
parent | 305dd91adfde332e7e5c1b2470edb32774f9a032 (diff) | |
download | systemd-f9fbac8b1fa23392f8ff8f2d8284676ed72f0138.tar.gz |
log: Remove log_ratelimit_debug() macros
These don't make sense anymore since we disable log ratelimiting
when logging at debug level.
Diffstat (limited to 'src/journal')
-rw-r--r-- | src/journal/journald-audit.c | 13 | ||||
-rw-r--r-- | src/journal/journald-console.c | 4 | ||||
-rw-r--r-- | src/journal/journald-kmsg.c | 5 | ||||
-rw-r--r-- | src/journal/journald-native.c | 33 | ||||
-rw-r--r-- | src/journal/journald-server.c | 27 | ||||
-rw-r--r-- | src/journal/journald-syslog.c | 5 | ||||
-rw-r--r-- | src/journal/journald-wall.c | 2 |
7 files changed, 34 insertions, 55 deletions
diff --git a/src/journal/journald-audit.c b/src/journal/journald-audit.c index 557dfdb7b6..d301d28966 100644 --- a/src/journal/journald-audit.c +++ b/src/journal/journald-audit.c @@ -264,8 +264,7 @@ static int map_all_fields( const char *v; if (*n >= m) { - log_ratelimit_debug( - JOURNALD_LOG_RATELIMIT, + log_debug( "More fields in audit message than audit field limit (%i), skipping remaining fields", N_IOVEC_AUDIT_FIELDS); return 0; @@ -310,8 +309,7 @@ static int map_all_fields( r = mf->map(mf->journal_field, &v, iovec, n); if (r < 0) - return log_ratelimit_debug_errno(r, JOURNALD_LOG_RATELIMIT, - "Failed to parse audit array: %m"); + return log_debug_errno(r, "Failed to parse audit array: %m"); if (r > 0) { mapped = true; @@ -323,8 +321,7 @@ static int map_all_fields( if (!mapped) { r = map_generic_field(prefix, &p, iovec, n); if (r < 0) - return log_ratelimit_debug_errno(r, JOURNALD_LOG_RATELIMIT, - "Failed to parse audit array: %m"); + return log_debug_errno(r, "Failed to parse audit array: %m"); if (r == 0) /* Couldn't process as generic field, let's just skip over it */ @@ -434,12 +431,12 @@ void server_process_audit_message( salen != sizeof(struct sockaddr_nl) || sa->nl.nl_family != AF_NETLINK || sa->nl.nl_pid != 0) { - log_ratelimit_debug(JOURNALD_LOG_RATELIMIT, "Audit netlink message from invalid sender."); + log_debug("Audit netlink message from invalid sender."); return; } if (!ucred || ucred->pid != 0) { - log_ratelimit_debug(JOURNALD_LOG_RATELIMIT, "Audit netlink message with invalid credentials."); + log_debug("Audit netlink message with invalid credentials."); return; } diff --git a/src/journal/journald-console.c b/src/journal/journald-console.c index 40a740ca40..2035e2d9b6 100644 --- a/src/journal/journald-console.c +++ b/src/journal/journald-console.c @@ -94,10 +94,10 @@ void server_forward_console( fd = open_terminal(tty, O_WRONLY|O_NOCTTY|O_CLOEXEC); if (fd < 0) { - log_ratelimit_debug_errno(fd, JOURNALD_LOG_RATELIMIT, "Failed to open %s for logging: %m", tty); + log_debug_errno(fd, "Failed to open %s for logging: %m", tty); return; } if (writev(fd, iovec, n) < 0) - log_ratelimit_debug_errno(errno, JOURNALD_LOG_RATELIMIT, "Failed to write to %s for logging: %m", tty); + log_debug_errno(errno, "Failed to write to %s for logging: %m", tty); } diff --git a/src/journal/journald-kmsg.c b/src/journal/journald-kmsg.c index b711df4557..6c1e7892d1 100644 --- a/src/journal/journald-kmsg.c +++ b/src/journal/journald-kmsg.c @@ -80,8 +80,7 @@ void server_forward_kmsg( iovec[n++] = IOVEC_MAKE_STRING("\n"); if (writev(s->dev_kmsg_fd, iovec, n) < 0) - log_ratelimit_debug_errno(errno, JOURNALD_LOG_RATELIMIT, - "Failed to write to /dev/kmsg for logging: %m"); + log_debug_errno(errno, "Failed to write to /dev/kmsg for logging: %m"); } static bool is_us(const char *identifier, const char *pid) { @@ -348,7 +347,7 @@ int server_flush_dev_kmsg(Server *s) { if (!s->dev_kmsg_readable) return 0; - log_ratelimit_debug(JOURNALD_LOG_RATELIMIT, "Flushing /dev/kmsg..."); + log_debug("Flushing /dev/kmsg..."); for (;;) { r = server_read_dev_kmsg(s); diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c index 1d2cb0b71a..21e20db2d4 100644 --- a/src/journal/journald-native.c +++ b/src/journal/journald-native.c @@ -122,8 +122,7 @@ static int server_process_entry( if (!e) { /* Trailing noise, let's ignore it, and flush what we collected */ - log_ratelimit_debug(JOURNALD_LOG_RATELIMIT, - "Received message with trailing noise, ignoring."); + log_debug("Received message with trailing noise, ignoring."); break; /* finish processing of the message */ } @@ -142,8 +141,7 @@ static int server_process_entry( /* A property follows */ if (n > ENTRY_FIELD_COUNT_MAX) { - log_ratelimit_debug(JOURNALD_LOG_RATELIMIT, - "Received an entry that has more than " STRINGIFY(ENTRY_FIELD_COUNT_MAX) " fields, ignoring entry."); + log_debug("Received an entry that has more than " STRINGIFY(ENTRY_FIELD_COUNT_MAX) " fields, ignoring entry."); goto finish; } @@ -163,15 +161,13 @@ static int server_process_entry( l = e - p; if (l > DATA_SIZE_MAX) { - log_ratelimit_debug(JOURNALD_LOG_RATELIMIT, - "Received text block of %zu bytes is too large, ignoring entry.", l); + log_debug("Received text block of %zu bytes is too large, ignoring entry.", l); goto finish; } if (entry_size + l + n + 1 > ENTRY_SIZE_MAX) { /* data + separators + trailer */ - log_ratelimit_debug(JOURNALD_LOG_RATELIMIT, - "Entry is too big (%zu bytes after processing %zu entries), ignoring entry.", - entry_size + l, n + 1); + log_debug("Entry is too big (%zu bytes after processing %zu entries), ignoring entry.", + entry_size + l, n + 1); goto finish; } @@ -195,31 +191,26 @@ static int server_process_entry( char *k; if (*remaining < e - p + 1 + sizeof(uint64_t) + 1) { - log_ratelimit_debug(JOURNALD_LOG_RATELIMIT, - "Failed to parse message, ignoring."); + log_debug("Failed to parse message, ignoring."); break; } l = unaligned_read_le64(e + 1); if (l > DATA_SIZE_MAX) { - log_ratelimit_debug(JOURNALD_LOG_RATELIMIT, - "Received binary data block of %"PRIu64" bytes is too large, ignoring entry.", - l); + log_debug("Received binary data block of %"PRIu64" bytes is too large, ignoring entry.", l); goto finish; } total = (e - p) + 1 + l; if (entry_size + total + n + 1 > ENTRY_SIZE_MAX) { /* data + separators + trailer */ - log_ratelimit_debug(JOURNALD_LOG_RATELIMIT, - "Entry is too big (%"PRIu64"bytes after processing %zu fields), ignoring.", - entry_size + total, n + 1); + log_debug("Entry is too big (%"PRIu64"bytes after processing %zu fields), ignoring.", + entry_size + total, n + 1); goto finish; } if ((uint64_t) *remaining < e - p + 1 + sizeof(uint64_t) + l + 1 || e[1+sizeof(uint64_t)+l] != '\n') { - log_ratelimit_debug(JOURNALD_LOG_RATELIMIT, - "Failed to parse message, ignoring."); + log_debug("Failed to parse message, ignoring."); break; } @@ -259,9 +250,7 @@ static int server_process_entry( entry_size += STRLEN("_TRANSPORT=journal"); if (entry_size + n + 1 > ENTRY_SIZE_MAX) { /* data + separators + trailer */ - log_ratelimit_debug(JOURNALD_LOG_RATELIMIT, - "Entry is too big with %zu properties and %zu bytes, ignoring.", - n, entry_size); + log_debug("Entry is too big with %zu properties and %zu bytes, ignoring.", n, entry_size); goto finish; } diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c index 3c49d9fa31..e86aa481d9 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -118,8 +118,7 @@ static int determine_path_usage( continue; if (fstatat(dirfd(d), de->d_name, &st, AT_SYMLINK_NOFOLLOW) < 0) { - log_ratelimit_debug_errno(errno, JOURNALD_LOG_RATELIMIT, - "Failed to stat %s/%s, ignoring: %m", path, de->d_name); + log_debug_errno(errno, "Failed to stat %s/%s, ignoring: %m", path, de->d_name); continue; } @@ -591,9 +590,7 @@ static int vacuum_offline_user_journals(Server *s) { r = parse_uid(u, &uid); if (r < 0) { - log_ratelimit_debug_errno(r, JOURNALD_LOG_RATELIMIT, - "Failed to parse UID from file name '%s', ignoring: %m", - de->d_name); + log_debug_errno(r, "Failed to parse UID from file name '%s', ignoring: %m", de->d_name); continue; } @@ -641,8 +638,7 @@ static int vacuum_offline_user_journals(Server *s) { "Failed to move %s out of the way, ignoring: %m", full); else - log_ratelimit_debug(JOURNALD_LOG_RATELIMIT, - "Successfully moved %s out of the way.", full); + log_debug("Successfully moved %s out of the way.", full); continue; } @@ -651,8 +647,7 @@ static int vacuum_offline_user_journals(Server *s) { r = journal_file_archive(f->file, NULL); if (r < 0) - log_ratelimit_debug_errno(r, JOURNALD_LOG_RATELIMIT, - "Failed to archive journal file '%s', ignoring: %m", full); + log_debug_errno(r, "Failed to archive journal file '%s', ignoring: %m", full); managed_journal_file_initiate_close(f, s->deferred_closes); f = NULL; @@ -666,7 +661,7 @@ void server_rotate(Server *s) { void *k; int r; - log_ratelimit_debug(JOURNALD_LOG_RATELIMIT, "Rotating..."); + log_debug("Rotating..."); /* First, rotate the system journal (either in its runtime flavour or in its runtime flavour) */ (void) do_rotate(s, &s->runtime_journal, "runtime", false, 0); @@ -743,7 +738,7 @@ static void do_vacuum(Server *s, JournalStorage *storage, bool verbose) { void server_vacuum(Server *s, bool verbose) { assert(s); - log_ratelimit_debug(JOURNALD_LOG_RATELIMIT, "Vacuuming..."); + log_debug("Vacuuming..."); s->oldest_file_usec = 0; @@ -803,7 +798,7 @@ static bool shall_try_append_again(JournalFile *f, int r) { case -EFBIG: /* Hit fs limit */ case -EDQUOT: /* Quota limit hit */ case -ENOSPC: /* Disk full */ - log_ratelimit_debug(JOURNALD_LOG_RATELIMIT, "%s: Allocation limit reached, rotating.", f->path); + log_debug("%s: Allocation limit reached, rotating.", f->path); return true; case -EIO: /* I/O error of some kind (mmap) */ @@ -924,7 +919,7 @@ static void write_to_journal(Server *s, uid_t uid, struct iovec *iovec, size_t n if (!f) return; - log_ratelimit_debug_errno(r, JOURNALD_LOG_RATELIMIT, "Retrying write."); + log_debug_errno(r, "Retrying write."); r = journal_file_append_entry(f->file, &ts, NULL, iovec, n, &s->seqnum, NULL, NULL); if (r < 0) log_ratelimit_error_errno(r, FAILED_TO_WRITE_ENTRY_RATELIMIT, @@ -1211,7 +1206,7 @@ int server_flush_to_var(Server *s, bool require_flag_file) { if (!s->system_journal) return 0; - log_ratelimit_debug(JOURNALD_LOG_RATELIMIT, "Flushing to %s...", s->system_storage.path); + log_debug("Flushing to %s...", s->system_storage.path); start = now(CLOCK_MONOTONIC); @@ -1258,7 +1253,7 @@ int server_flush_to_var(Server *s, bool require_flag_file) { goto finish; } - log_ratelimit_debug(JOURNALD_LOG_RATELIMIT, "Retrying write."); + log_debug("Retrying write."); r = journal_file_copy_entry(f, s->system_journal->file, o, f->current_offset); if (r < 0) { log_ratelimit_error_errno(r, JOURNALD_LOG_RATELIMIT, "Can't write entry: %m"); @@ -1309,7 +1304,7 @@ static int server_relinquish_var(Server *s) { if (s->runtime_journal && !s->system_journal) return 0; - log_ratelimit_debug(JOURNALD_LOG_RATELIMIT, "Relinquishing %s...", s->system_storage.path); + log_debug("Relinquishing %s...", s->system_storage.path); (void) system_journal_open(s, false, true); diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c index 4592bc7bba..6394adfdfd 100644 --- a/src/journal/journald-syslog.c +++ b/src/journal/journald-syslog.c @@ -50,8 +50,7 @@ static void forward_syslog_iovec( j = strjoina(s->runtime_directory, "/syslog"); r = sockaddr_un_set_path(&sa.un, j); if (r < 0) { - log_ratelimit_debug_errno(r, JOURNALD_LOG_RATELIMIT, - "Forwarding socket path %s too long for AF_UNIX, not forwarding: %m", j); + log_debug_errno(r, "Forwarding socket path %s too long for AF_UNIX, not forwarding: %m", j); return; } @@ -105,7 +104,7 @@ static void forward_syslog_iovec( } if (errno != ENOENT) - log_ratelimit_debug_errno(errno, JOURNALD_LOG_RATELIMIT, "Failed to forward syslog message: %m"); + log_debug_errno(errno, "Failed to forward syslog message: %m"); } static void forward_syslog_raw(Server *s, int priority, const char *buffer, size_t buffer_len, const struct ucred *ucred, const struct timeval *tv) { diff --git a/src/journal/journald-wall.c b/src/journal/journald-wall.c index e7d4adca3e..21ec5a785b 100644 --- a/src/journal/journald-wall.c +++ b/src/journal/journald-wall.c @@ -50,5 +50,5 @@ void server_forward_wall( r = utmp_wall(l, "systemd-journald", NULL, NULL, NULL); if (r < 0) - log_ratelimit_debug_errno(r, JOURNALD_LOG_RATELIMIT, "Failed to send wall message: %m"); + log_debug_errno(r, "Failed to send wall message: %m"); } |