diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-03-07 14:32:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-03-07 14:32:10 +0000 |
| commit | fc5b2a9995d2ba1f70226fe750f73f9e20d3906e (patch) | |
| tree | e4d450d9a372881d1164054eb1a099344df52369 /oslo_rootwrap/wrapper.py | |
| parent | d089ff3ee9d8725917526b69fb1959c045ccf861 (diff) | |
| parent | 6285b63572c893391cb1a9e0c482658938f13329 (diff) | |
| download | oslo-rootwrap-fc5b2a9995d2ba1f70226fe750f73f9e20d3906e.tar.gz | |
Merge "Allow rootwrap-daemon to timeout and exit"5.6.0
Diffstat (limited to 'oslo_rootwrap/wrapper.py')
| -rw-r--r-- | oslo_rootwrap/wrapper.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/oslo_rootwrap/wrapper.py b/oslo_rootwrap/wrapper.py index 6a96e1a..dd223fa 100644 --- a/oslo_rootwrap/wrapper.py +++ b/oslo_rootwrap/wrapper.py @@ -91,6 +91,12 @@ class RootwrapConfig(object): else: self.use_syslog = False + # daemon_timeout + if config.has_option("DEFAULT", "daemon_timeout"): + self.daemon_timeout = int(config.get("DEFAULT", "daemon_timeout")) + else: + self.daemon_timeout = 600 + def setup_syslog(execname, facility, level): rootwrap_logger = logging.getLogger() |