diff options
| author | Pavel Březina <pbrezina@redhat.com> | 2011-08-03 09:15:52 +0200 |
|---|---|---|
| committer | Stephen Gallagher <sgallagh@redhat.com> | 2011-08-25 15:46:11 -0400 |
| commit | 89caf5edcc99f5731e89bd51e6ffaad3ec11c304 (patch) | |
| tree | d7b5638ccf515fac99454d18d7685d2329450e02 /src/monitor | |
| parent | fe60346714a73ac3987f786731389320633dd245 (diff) | |
| download | sssd_unused-89caf5edcc99f5731e89bd51e6ffaad3ec11c304.tar.gz sssd_unused-89caf5edcc99f5731e89bd51e6ffaad3ec11c304.tar.xz sssd_unused-89caf5edcc99f5731e89bd51e6ffaad3ec11c304.zip | |
New DEBUG facility - SSSDBG_UNRESOLVED changed from -1 to 0
Removed:
SSS_UNRESOLVED_DEBUG_LEVEL (completely replaced with SSSDBG_UNRESOLVED)
Added new macro:
CONVERT_AND_SET_DEBUG_LEVEL(new_value)
Changes unresolved debug level value (SSSDBG_UNRESOLVED) from -1 to 0
so DEBUG macro could be reduced by one condition. Anyway, it has a minor
effect, every time you want to load debug_level from command line parameters,
you have to use following pattern:
/* Set debug level to invalid value so we can deside if -d 0 was used. */
debug_level = SSSDBG_INVALID;
pc = poptGetContext(argv[0], argc, argv, long_options, 0);
while((opt = poptGetNextOpt(pc)) != -1) { ... }
CONVERT_AND_SET_DEBUG_LEVEL(debug_level);
Diffstat (limited to 'src/monitor')
| -rw-r--r-- | src/monitor/monitor.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/monitor/monitor.c b/src/monitor/monitor.c index 20696246..45744758 100644 --- a/src/monitor/monitor.c +++ b/src/monitor/monitor.c @@ -943,7 +943,7 @@ static int get_service_config(struct mt_ctx *ctx, const char *name, } if (!svc->command) { - if (cmdline_debug_level == SSS_UNRESOLVED_DEBUG_LEVEL) { + if (cmdline_debug_level == SSSDBG_UNRESOLVED) { svc->command = talloc_asprintf(svc, "%s/sssd_%s %s%s", SSSD_LIBEXEC_PATH, svc->name, @@ -1089,7 +1089,7 @@ static int get_provider_config(struct mt_ctx *ctx, const char *name, /* if there are no custom commands, build a default one */ if (!svc->command) { - if (cmdline_debug_level == SSS_UNRESOLVED_DEBUG_LEVEL) { + if (cmdline_debug_level == SSSDBG_UNRESOLVED) { svc->command = talloc_asprintf(svc, "%s/sssd_be --domain %s%s%s", SSSD_LIBEXEC_PATH, @@ -2321,6 +2321,9 @@ int main(int argc, const char *argv[]) POPT_TABLEEND }; + /* Set debug level to invalid value so we can deside if -d 0 was used. */ + debug_level = SSSDBG_INVALID; + pc = poptGetContext(argv[0], argc, argv, long_options, 0); while((opt = poptGetNextOpt(pc)) != -1) { switch(opt) { @@ -2331,7 +2334,8 @@ int main(int argc, const char *argv[]) return 1; } } - debug_level = debug_convert_old_level(debug_level); + + CONVERT_AND_SET_DEBUG_LEVEL(debug_level); /* If the level was passed at the command-line, we want * to save it and pass it to the children later. |