summaryrefslogtreecommitdiff
path: root/src/config
diff options
context:
space:
mode:
authorJakub Hrozek <jhrozek@redhat.com>2012-04-16 12:01:37 +0200
committerStephen Gallagher <sgallagh@redhat.com>2012-04-20 10:55:14 -0400
commitb83e43eb88879c7fb3114aafcc525356ff7d4235 (patch)
treeee91f09dea503112d13d4ec67ab8f947661b4795 /src/config
parentcdf4599ba44a6b17818cb5e77f3a727491b7e85e (diff)
downloadsssd-b83e43eb88879c7fb3114aafcc525356ff7d4235.tar.gz
sssd-b83e43eb88879c7fb3114aafcc525356ff7d4235.tar.bz2
sssd-b83e43eb88879c7fb3114aafcc525356ff7d4235.zip
Make the monitor SIGKILL time configurable
https://fedorahosted.org/sssd/ticket/1119
Diffstat (limited to 'src/config')
-rw-r--r--src/config/SSSDConfig.py1
-rwxr-xr-xsrc/config/SSSDConfigTest.py1
-rw-r--r--src/config/etc/sssd.api.conf1
3 files changed, 3 insertions, 0 deletions
diff --git a/src/config/SSSDConfig.py b/src/config/SSSDConfig.py
index f4987997..20cd2a28 100644
--- a/src/config/SSSDConfig.py
+++ b/src/config/SSSDConfig.py
@@ -41,6 +41,7 @@ option_strings = {
'debug_microseconds' : _('Include microseconds in timestamps in debug logs'),
'debug_to_files' : _('Write debug messages to logfiles'),
'timeout' : _('Ping timeout before restarting service'),
+ 'force_timeout' : _('Timeout between three failed ping checks and forcibly killing the service'),
'command' : _('Command to start service'),
'reconnection_retries' : _('Number of times to attempt connection to Data Providers'),
'fd_limit' : _('The number of file descriptors that may be opened by this responder'),
diff --git a/src/config/SSSDConfigTest.py b/src/config/SSSDConfigTest.py
index 000c7dba..2d3cd858 100755
--- a/src/config/SSSDConfigTest.py
+++ b/src/config/SSSDConfigTest.py
@@ -263,6 +263,7 @@ class SSSDConfigTestSSSDService(unittest.TestCase):
'services',
'domains',
'timeout',
+ 'force_timeout',
'sbus_timeout',
're_expression',
'full_name_format',
diff --git a/src/config/etc/sssd.api.conf b/src/config/etc/sssd.api.conf
index 155b8efe..7b238ffd 100644
--- a/src/config/etc/sssd.api.conf
+++ b/src/config/etc/sssd.api.conf
@@ -16,6 +16,7 @@ fd_limit = int, None, false
services = list, str, true, nss, pam
domains = list, str, true
timeout = int, None, false
+force_timeout = int, None, false
sbus_timeout = int, None, false
re_expression = str, None, false
full_name_format = str, None, false