diff options
| author | Stephen Gallagher <sgallagh@redhat.com> | 2016-04-26 11:04:36 -0400 |
|---|---|---|
| committer | Jakub Hrozek <jhrozek@redhat.com> | 2016-06-16 13:36:44 +0200 |
| commit | 131684b9107a3fc07906013d16b35975531f2864 (patch) | |
| tree | 99a7bd6aedf5f55e521ce66cdfe2d645c50cebf4 /src/config | |
| parent | 60787fb44924e84a0c7ddfe9d5e62e64ea1edcd1 (diff) | |
| download | sssd-131684b9107a3fc07906013d16b35975531f2864.tar.gz sssd-131684b9107a3fc07906013d16b35975531f2864.tar.xz sssd-131684b9107a3fc07906013d16b35975531f2864.zip | |
DEBUG: Add `debug` alias for debug_level
Our users constantly make the mistake of typing `debug = 9` in the
sssd.conf instead of `debug_level = 9` as would be correct. This
happens frequently-enough that we should just alias it rather than
continue to have people make mistakes.
Resolves:
https://fedorahosted.org/sssd/ticket/2999
Reviewed-by: Pavel Březina <pbrezina@redhat.com>
Reviewed-by: Petr Cech <pcech@redhat.com>
Diffstat (limited to 'src/config')
| -rw-r--r-- | src/config/SSSDConfig/__init__.py.in | 1 | ||||
| -rwxr-xr-x | src/config/SSSDConfigTest.py | 3 | ||||
| -rw-r--r-- | src/config/etc/sssd.api.conf | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/src/config/SSSDConfig/__init__.py.in b/src/config/SSSDConfig/__init__.py.in index abbf5dca8..06127584f 100644 --- a/src/config/SSSDConfig/__init__.py.in +++ b/src/config/SSSDConfig/__init__.py.in @@ -40,6 +40,7 @@ else: # TODO: This needs to be made external option_strings = { # [service] + 'debug' : _('Set the verbosity of the debug logging'), 'debug_level' : _('Set the verbosity of the debug logging'), 'debug_timestamps' : _('Include timestamps in debug logs'), 'debug_microseconds' : _('Include microseconds in timestamps in debug logs'), diff --git a/src/config/SSSDConfigTest.py b/src/config/SSSDConfigTest.py index e518c7565..6ec30234e 100755 --- a/src/config/SSSDConfigTest.py +++ b/src/config/SSSDConfigTest.py @@ -299,6 +299,7 @@ class SSSDConfigTestSSSDService(unittest.TestCase): 'krb5_rcache_dir', 'user', 'default_domain_suffix', + 'debug', 'debug_level', 'debug_timestamps', 'debug_microseconds', @@ -497,6 +498,7 @@ class SSSDConfigTestSSSDDomain(unittest.TestCase): options = domain.list_options() control_list = [ 'description', + 'debug', 'debug_level', 'debug_timestamps', 'min_id', @@ -863,6 +865,7 @@ class SSSDConfigTestSSSDDomain(unittest.TestCase): options = domain.list_options() control_list = [ 'description', + 'debug', 'debug_level', 'debug_timestamps', 'min_id', diff --git a/src/config/etc/sssd.api.conf b/src/config/etc/sssd.api.conf index fef55364d..91146593d 100644 --- a/src/config/etc/sssd.api.conf +++ b/src/config/etc/sssd.api.conf @@ -3,6 +3,7 @@ [service] # Options available to all services +debug = int, None, false debug_level = int, None, false debug_timestamps = bool, None, false debug_microseconds = bool, None, false @@ -108,6 +109,7 @@ subdomains_provider = str, None, false [domain] # Options available to all domains description = str, None, false +debug = int, None, false debug_level = int, None, false debug_timestamps = bool, None, false command = str, None, false |