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

Return a 503 when the Salt master is down; for commands and auths

Browse Source
This commit is contained in:
Seth House 2015-04-22 18:22:17 -06:00
parent 036c14cc59
commit e83f73d3e8
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -394,6 +394,9 @@ def hypermedia_handler(*args, **kwargs):
except (salt.exceptions.EauthAuthenticationError, except (salt.exceptions.EauthAuthenticationError,
salt.exceptions.TokenAuthenticationError): salt.exceptions.TokenAuthenticationError):
raise cherrypy.HTTPError(401) raise cherrypy.HTTPError(401)
except (salt.exceptions.SaltDaemonNotRunning,
salt.exceptions.SaltReqTimeoutError) as exc:
raise cherrypy.HTTPError(503, exc.strerror)
except cherrypy.CherryPyException: except cherrypy.CherryPyException:
raise raise
except Exception as exc: except Exception as exc:
@ -1361,6 +1364,10 @@ class Login(LowDataAdapter):
] ]
}} }}
''' '''
if not self.api.is_master_running():
raise salt.exceptions.SaltDaemonNotRunning(
'Salt Master is not available.')
# the urlencoded_processor will wrap this in a list # the urlencoded_processor will wrap this in a list
if isinstance(cherrypy.serving.request.lowstate, list): if isinstance(cherrypy.serving.request.lowstate, list):
creds = cherrypy.serving.request.lowstate[0] creds = cherrypy.serving.request.lowstate[0]