cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Added exception handling to database creation and deletion. Fixes #8075.

Browse source
This commit is contained in:
Graham Mainwaring 2014-07-10 22:28:56 -04:00
parent a320c02c81
commit 980d9da7e9
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
library/database/mysql_db
View file

@ -319,7 +319,10 @@ def main():
changed = False changed = False
if db_exists(cursor, db): if db_exists(cursor, db):
if state == "absent": if state == "absent":
changed = db_delete(cursor, db) try:
changed = db_delete(cursor, db)
except Exception, e:
module.fail_json(msg="error deleting database: " + str(e))
elif state == "dump": elif state == "dump":
rc, stdout, stderr = db_dump(module, login_host, login_user, rc, stdout, stderr = db_dump(module, login_host, login_user,
login_password, db, target, login_password, db, target,
@ -340,7 +343,10 @@ def main():
module.exit_json(changed=True, db=db, msg=stdout) module.exit_json(changed=True, db=db, msg=stdout)
else: else:
if state == "present": if state == "present":
changed = db_create(cursor, db, encoding, collation) try:
changed = db_create(cursor, db, encoding, collation)
except Exception, e:
module.fail_json(msg="error creating database: " + str(e))
module.exit_json(changed=changed, db=db) module.exit_json(changed=changed, db=db)