mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-04-26 12:21:26 -07:00
Fix for missing import and boilerplate
Fix adds missing imports and boilerplate for proxysql. It also remove get_exception calls in-favor of native exception. Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
This commit is contained in:
parent
afbad8789f
commit
97240a9ebc
8 changed files with 75 additions and 168 deletions
|
@ -1,20 +1,10 @@
|
|||
#!/usr/bin/python
|
||||
# -*- coding: utf-8 -*-
|
||||
# Copyright: (c) 2017, Ansible Project
|
||||
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
|
||||
|
||||
# This file is part of Ansible
|
||||
#
|
||||
# Ansible is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# Ansible is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with Ansible. If not, see <http://www.gnu.org/licenses/>.
|
||||
from __future__ import absolute_import, division, print_function
|
||||
__metaclass__ = type
|
||||
|
||||
DOCUMENTATION = '''
|
||||
---
|
||||
|
@ -186,8 +176,8 @@ ANSIBLE_METADATA = {'metadata_version': '1.0',
|
|||
|
||||
from ansible.module_utils.basic import AnsibleModule
|
||||
from ansible.module_utils.mysql import mysql_connect
|
||||
from ansible.module_utils.pycompat24 import get_exception
|
||||
from ansible.module_utils.six import iteritems
|
||||
from ansible.module_utils._text import to_native
|
||||
|
||||
try:
|
||||
import MySQLdb
|
||||
|
@ -495,10 +485,9 @@ def main():
|
|||
login_password,
|
||||
config_file,
|
||||
cursor_class=MySQLdb.cursors.DictCursor)
|
||||
except MySQLdb.Error:
|
||||
e = get_exception()
|
||||
except MySQLdb.Error as e:
|
||||
module.fail_json(
|
||||
msg="unable to connect to ProxySQL Admin Module.. %s" % e
|
||||
msg="unable to connect to ProxySQL Admin Module.. %s" % to_native(e)
|
||||
)
|
||||
|
||||
proxysql_server = ProxySQLServer(module)
|
||||
|
@ -525,10 +514,9 @@ def main():
|
|||
" and doesn't need to be updated.")
|
||||
result['server'] = \
|
||||
proxysql_server.get_server_config(cursor)
|
||||
except MySQLdb.Error:
|
||||
e = get_exception()
|
||||
except MySQLdb.Error as e:
|
||||
module.fail_json(
|
||||
msg="unable to modify server.. %s" % e
|
||||
msg="unable to modify server.. %s" % to_native(e)
|
||||
)
|
||||
|
||||
elif proxysql_server.state == "absent":
|
||||
|
@ -541,10 +529,9 @@ def main():
|
|||
result['changed'] = False
|
||||
result['msg'] = ("The server is already absent from the" +
|
||||
" mysql_hosts memory configuration")
|
||||
except MySQLdb.Error:
|
||||
e = get_exception()
|
||||
except MySQLdb.Error as e:
|
||||
module.fail_json(
|
||||
msg="unable to remove server.. %s" % e
|
||||
msg="unable to remove server.. %s" % to_native(e)
|
||||
)
|
||||
|
||||
module.exit_json(**result)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue