diff options
| author | Michal Zidek <mzidek@redhat.com> | 2012-11-19 13:10:39 +0100 |
|---|---|---|
| committer | Jakub Hrozek <jhrozek@redhat.com> | 2012-11-26 20:58:41 +0100 |
| commit | 3d97f2645356adca1e9e6eeca4f735a1acbed15d (patch) | |
| tree | 1a70b7ac1d2b3a1744309f12cb5cfa7ae1087a12 | |
| parent | d5351fd908e78c7639c839853c737b96e048f95a (diff) | |
| download | sssd-3d97f2645356adca1e9e6eeca4f735a1acbed15d.tar.gz sssd-3d97f2645356adca1e9e6eeca4f735a1acbed15d.tar.bz2 sssd-3d97f2645356adca1e9e6eeca4f735a1acbed15d.zip | |
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
| -rw-r--r-- | src/monitor/monitor.c | 6 | ||||
| -rw-r--r-- | 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 40f1f56c..71f91572 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 2d63e733..75ac771b 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 DEBUG_INIT(dbg_lvl) do { \ if (dbg_lvl != SSSDBG_INVALID) { \ |