diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2013-03-28 13:33:20 +0100 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2013-04-02 15:16:04 +0200 |
| commit | 2edf488b3844a067bcdfe8f8efdf1a086c52a5cf (patch) | |
| tree | ecd6ed8897485678a0015d564ed96d3048cebd0f /lib | |
| parent | 5c93f3997b11b33742c562b39d60949bf7e6c01d (diff) | |
| download | lvm2-2edf488b3844a067bcdfe8f8efdf1a086c52a5cf.tar.gz | |
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.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/log/log.c | 9 |
1 files 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(), |