From ec5a7857127a1b3b9c5517c4a70a9b2c8aab35ca Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sat, 22 Jan 2011 01:08:36 +0100 Subject: ratelimit: fix log levels of log suppression messages When logging a suppression message do so on the same log level as the suppressed messages. --- src/modules/alsa/alsa-sink.c | 6 +++--- src/modules/alsa/alsa-source.c | 4 ++-- src/modules/module-udev-detect.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/modules') diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c index 112f02e7..8984b860 100644 --- a/src/modules/alsa/alsa-sink.c +++ b/src/modules/alsa/alsa-sink.c @@ -439,7 +439,7 @@ static size_t check_left_to_play(struct userdata *u, size_t n_bytes, pa_bool_t o #endif if (!u->first && !u->after_rewind) - if (pa_log_ratelimit()) + if (pa_log_ratelimit(PA_LOG_INFO)) pa_log_info("Underrun!"); } @@ -1440,7 +1440,7 @@ static void thread_func(void *userdata) { * we have filled the buffer at least once * completely.*/ - if (pa_log_ratelimit()) + if (pa_log_ratelimit(PA_LOG_DEBUG)) pa_log_debug("Cutting sleep time for the initial iterations by half."); sleep_usec /= 2; } @@ -1492,7 +1492,7 @@ static void thread_func(void *userdata) { u->first = TRUE; u->since_start = 0; - } else if (revents && u->use_tsched && pa_log_ratelimit()) + } else if (revents && u->use_tsched && pa_log_ratelimit(PA_LOG_DEBUG)) pa_log_debug("Wakeup from ALSA!"); } else diff --git a/src/modules/alsa/alsa-source.c b/src/modules/alsa/alsa-source.c index b04ac0d6..076f0441 100644 --- a/src/modules/alsa/alsa-source.c +++ b/src/modules/alsa/alsa-source.c @@ -428,7 +428,7 @@ static size_t check_left_to_record(struct userdata *u, size_t n_bytes, pa_bool_t PA_DEBUG_TRAP; #endif - if (pa_log_ratelimit()) + if (pa_log_ratelimit(PA_LOG_INFO)) pa_log_info("Overrun!"); } @@ -1315,7 +1315,7 @@ static void thread_func(void *userdata) { goto fail; u->first = TRUE; - } else if (revents && u->use_tsched && pa_log_ratelimit()) + } else if (revents && u->use_tsched && pa_log_ratelimit(PA_LOG_DEBUG)) pa_log_debug("Wakeup from ALSA!"); } else diff --git a/src/modules/module-udev-detect.c b/src/modules/module-udev-detect.c index 3cf3e58c..439f556d 100644 --- a/src/modules/module-udev-detect.c +++ b/src/modules/module-udev-detect.c @@ -321,7 +321,7 @@ static void verify_access(struct userdata *u, struct device *d) { * during opening was canceled by a "try again" * failure or a "fatal" failure. */ - if (pa_ratelimit_test(&d->ratelimit)) { + if (pa_ratelimit_test(&d->ratelimit, PA_LOG_DEBUG)) { pa_log_debug("Loading module-alsa-card with arguments '%s'", d->args); m = pa_module_load(u->core, "module-alsa-card", d->args); -- cgit