valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Handle timeout_monitor/TimeoutError issues for new versions of CherryPy

Browse Source 
Fixes #44601
This commit is contained in:
rallytime 2017-11-20 10:47:27 -05:00
parent 446e3436c2
commit 477c3caa77
No known key found for this signature in database
GPG Key ID: E8F1A4B90D0DEA19
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
salt/netapi/rest_cherrypy/app.py
View File

@ -102,6 +102,13 @@ A REST API for Salt
expire_responses : True expire_responses : True
Whether to check for and kill HTTP responses that have exceeded the Whether to check for and kill HTTP responses that have exceeded the
default timeout. default timeout.
.. deprecated:: 2016.11.9, 2017.7.3, Oxygen
The "expire_responses" configuration setting, which corresponds
to the ``timeout_monitor`` setting in CherryPy, is no longer
supported in CherryPy versions >= 12.0.0.
max_request_body_size : ``1048576`` max_request_body_size : ``1048576``
Maximum size for the HTTP request body. Maximum size for the HTTP request body.
collect_stats : False collect_stats : False
@ -606,8 +613,10 @@ import yaml
# Import Salt libs # Import Salt libs
import salt import salt
import salt.auth import salt.auth
import salt.exceptions
import salt.utils.event import salt.utils.event
import salt.utils.stringutils import salt.utils.stringutils
import salt.utils.versions
from salt.ext import six from salt.ext import six
# Import salt-api libs # Import salt-api libs
@ -854,7 +863,8 @@ def hypermedia_handler(*args, **kwargs):
except (salt.exceptions.SaltDaemonNotRunning, except (salt.exceptions.SaltDaemonNotRunning,
salt.exceptions.SaltReqTimeoutError) as exc: salt.exceptions.SaltReqTimeoutError) as exc:
raise cherrypy.HTTPError(503, exc.strerror) raise cherrypy.HTTPError(503, exc.strerror)
except (cherrypy.TimeoutError, salt.exceptions.SaltClientTimeout): except (cherrypy.TimeoutError if hasattr(cherrypy, 'TimeoutError') else None,
salt.exceptions.SaltClientTimeout):
raise cherrypy.HTTPError(504) raise cherrypy.HTTPError(504)
except cherrypy.CherryPyException: except cherrypy.CherryPyException:
raise raise
@ -2839,8 +2849,6 @@ class API(object):
'server.socket_port': self.apiopts.get('port', 8000), 'server.socket_port': self.apiopts.get('port', 8000),
'server.thread_pool': self.apiopts.get('thread_pool', 100), 'server.thread_pool': self.apiopts.get('thread_pool', 100),
'server.socket_queue_size': self.apiopts.get('queue_size', 30), 'server.socket_queue_size': self.apiopts.get('queue_size', 30),
'engine.timeout_monitor.on': self.apiopts.get(
'expire_responses', True),
'max_request_body_size': self.apiopts.get( 'max_request_body_size': self.apiopts.get(
'max_request_body_size', 1048576), 'max_request_body_size', 1048576),
'debug': self.apiopts.get('debug', False), 'debug': self.apiopts.get('debug', False),
@ -2858,6 +2866,14 @@ class API(object):
}, },
} }
if salt.utils.versions.version_cmp(cherrypy.__version__, '12.0.0') < 0:
# CherryPy >= 12.0 no longer supports "timeout_monitor", only set
# this config option when using an older version of CherryPy.
# See Issue #44601 for more information.
conf['global']['engine.timeout_monitor.on'] = self.apiopts.get(
'expire_responses', True
)
if cpstats and self.apiopts.get('collect_stats', False): if cpstats and self.apiopts.get('collect_stats', False):
conf['/']['tools.cpstats.on'] = True conf['/']['tools.cpstats.on'] = True