From 962333af01aff50cb2cbe536dc263d942d394a20 Mon Sep 17 00:00:00 2001 From: Michal Zidek Date: Mon, 19 Nov 2012 13:10:39 +0100 Subject: debug: print fatal and critical errors if debug level is unresolved If global variable debug_level has value SSSDBG_UNRESOLVED, we should print at least fatal and critical errors. https://fedorahosted.org/sssd/ticket/1345 --- src/monitor/monitor.c | 6 ------ src/util/util.h | 5 ++++- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/monitor/monitor.c b/src/monitor/monitor.c index 8e73ff66d..afec0b95f 100644 --- a/src/monitor/monitor.c +++ b/src/monitor/monitor.c @@ -2752,12 +2752,6 @@ int main(int argc, const char *argv[]) /* Parse config file, fail if cannot be done */ ret = load_configuration(tmp_ctx, config_file, &monitor); if (ret != EOK) { - /* if debug level has not been set, set it manually to make these - * critical failures visible */ - if (debug_level == SSSDBG_UNRESOLVED) { - debug_level = SSSDBG_MASK_ALL; - } - if (ret == EPERM) { DEBUG(1, ("Cannot read configuration file %s\n", config_file)); sss_log(SSS_LOG_ALERT, diff --git a/src/util/util.h b/src/util/util.h index 9e55e5065..1f7c6c344 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -193,7 +193,10 @@ errno_t set_debug_file_from_fd(const int fd); \param level the debug level, please use one of the SSSDBG*_ macros */ -#define DEBUG_IS_SET(level) (debug_level & (level)) +#define DEBUG_IS_SET(level) (debug_level & (level) || \ + (debug_level == SSSDBG_UNRESOLVED && \ + (level & (SSSDBG_FATAL_FAILURE | \ + SSSDBG_CRIT_FAILURE)))) #define CONVERT_AND_SET_DEBUG_LEVEL(new_value) debug_level = ( \ ((new_value) != SSSDBG_INVALID) \ -- cgit