Properly report exception causes particularly connection exceptions contacting the consul agent
This commit is contained in:
parent
e701972186
commit
b5faf88494
4 changed files with 25 additions and 20 deletions
|
@ -143,6 +143,7 @@ except ImportError, e:
|
|||
"see http://python-consul.readthedocs.org/en/latest/#installation'"
|
||||
sys.exit(1)
|
||||
|
||||
from requests.exceptions import ConnectionError
|
||||
|
||||
def register_with_consul(module):
|
||||
|
||||
|
@ -453,11 +454,11 @@ def main():
|
|||
)
|
||||
try:
|
||||
register_with_consul(module)
|
||||
except IOError, e:
|
||||
error = e.read()
|
||||
if not error:
|
||||
error = str(e)
|
||||
module.fail_json(msg=error)
|
||||
except ConnectionError, e:
|
||||
module.fail_json(msg='Could not connect to consul agent at %s:%s, error was %s' % (
|
||||
module.params.get('host'), module.params.get('port'), str(e)))
|
||||
except Exception, e:
|
||||
module.fail_json(msg=str(e))
|
||||
|
||||
# import module snippets
|
||||
from ansible.module_utils.basic import *
|
||||
|
|
|
@ -92,6 +92,7 @@ except ImportError:
|
|||
" see https://pypi.python.org/pypi/pyhcl'"
|
||||
sys.exit(1)
|
||||
|
||||
from requests.exceptions import ConnectionError
|
||||
|
||||
def execute(module):
|
||||
|
||||
|
@ -284,11 +285,11 @@ def main():
|
|||
|
||||
try:
|
||||
execute(module)
|
||||
except IOError, e:
|
||||
error = e.read()
|
||||
if not error:
|
||||
error = str(e)
|
||||
module.fail_json(msg=error)
|
||||
except ConnectionError, e:
|
||||
module.fail_json(msg='Could not connect to consul agent at %s:%s, error was %s' % (
|
||||
module.params.get('host'), module.params.get('port'), str(e)))
|
||||
except Exception, e:
|
||||
module.fail_json(msg=str(e))
|
||||
|
||||
# import module snippets
|
||||
from ansible.module_utils.basic import *
|
||||
|
|
|
@ -117,6 +117,7 @@ except ImportError, e:
|
|||
see http://python-consul.readthedocs.org/en/latest/#installation'"""
|
||||
sys.exit(1)
|
||||
|
||||
from requests.exceptions import ConnectionError
|
||||
|
||||
def execute(module):
|
||||
|
||||
|
@ -227,11 +228,12 @@ def main():
|
|||
|
||||
try:
|
||||
execute(module)
|
||||
except IOError, e:
|
||||
error = e.read()
|
||||
if not error:
|
||||
error = str(e)
|
||||
module.fail_json(msg=error)
|
||||
except ConnectionError, e:
|
||||
module.fail_json(msg='Could not connect to consul agent at %s:%s, error was %s' % (
|
||||
module.params.get('host'), module.params.get('port'), str(e)))
|
||||
except Exception, e:
|
||||
module.fail_json(msg=str(e))
|
||||
|
||||
|
||||
# import module snippets
|
||||
from ansible.module_utils.basic import *
|
||||
|
|
|
@ -80,6 +80,7 @@ except ImportError, e:
|
|||
"http://python-consul.readthedocs.org/en/latest/#installation'"
|
||||
sys.exit(1)
|
||||
|
||||
from requests.errors import ConnectionError
|
||||
|
||||
def execute(module):
|
||||
|
||||
|
@ -202,11 +203,11 @@ def main():
|
|||
|
||||
try:
|
||||
execute(module)
|
||||
except IOError, e:
|
||||
error = e.read()
|
||||
if not error:
|
||||
error = str(e)
|
||||
module.fail_json(msg=error)
|
||||
except ConnectionError, e:
|
||||
module.fail_json(msg='Could not connect to consul agent at %s:%s, error was %s' % (
|
||||
module.params.get('host'), module.params.get('port'), str(e)))
|
||||
except Exception, e:
|
||||
module.fail_json(msg=str(e))
|
||||
|
||||
# import module snippets
|
||||
from ansible.module_utils.basic import *
|
||||
|
|
Loading…
Reference in a new issue