From 2edf488b3844a067bcdfe8f8efdf1a086c52a5cf Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Thu, 28 Mar 2013 13:33:20 +0100 Subject: [PATCH] log: reenable abort abort_on_internal_error got ignored with the new class logging commit.j Put this check back in this return path, so the check is not skipped. --- lib/log/log.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/log/log.c b/lib/log/log.c index 3b038f522..06e053f9a 100644 --- a/lib/log/log.c +++ b/lib/log/log.c @@ -346,11 +346,12 @@ void print_log(int level, const char *file, int line, int dm_errno_or_class, va_end(ap); } - if (level > debug_level()) - return; - - if (level >= _LOG_DEBUG && !debug_class_is_logged(dm_errno_or_class)) + if ((level > debug_level()) || + (level >= _LOG_DEBUG && !debug_class_is_logged(dm_errno_or_class))) { + if (fatal_internal_error) + abort(); return; + } if (_log_to_file && (_log_while_suspended || !critical_section())) { fprintf(_log_file, "%s:%d %s%s", file, line, log_command_name(), -- 2.43.5