]> sourceware.org Git - lvm2.git/commitdiff
log: reenable abort
authorZdenek Kabelac <zkabelac@redhat.com>
Thu, 28 Mar 2013 12:33:20 +0000 (13:33 +0100)
committerZdenek Kabelac <zkabelac@redhat.com>
Tue, 2 Apr 2013 13:16:04 +0000 (15:16 +0200)
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

index 3b038f5225cd65958664595d419f4ad0b8e2500c..06e053f9abaccc2cfda84e8d6a734d4741142e35 100644 (file)
@@ -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(),
This page took 0.040087 seconds and 5 git commands to generate.