From 6b26a73681896db8e0c458c6f69ee49394f1fdb0 Mon Sep 17 00:00:00 2001
From: Dylan Martin <dmartin@sccd.ctc.edu>
Date: Wed, 2 Oct 2013 13:00:07 -0700
Subject: [PATCH 1/2] switch to DictCursor

---
 library/database/mysql_replication | 63 +++++-------------------------
 1 file changed, 10 insertions(+), 53 deletions(-)

diff --git a/library/database/mysql_replication b/library/database/mysql_replication
index 32702369d6..59116dab23 100644
--- a/library/database/mysql_replication
+++ b/library/database/mysql_replication
@@ -294,69 +294,26 @@ def main():
             db_connection = MySQLdb.connect(host=module.params["login_host"], unix_socket=module.params["login_unix_socket"], user=login_user, passwd=login_password, db="mysql")
         else:
             db_connection = MySQLdb.connect(host=module.params["login_host"], user=login_user, passwd=login_password, db="mysql")
-        cursor = db_connection.cursor()
     except Exception, e:
         module.fail_json(msg="unable to connect to database, check login_user and login_password are correct or ~/.my.cnf has the credentials")
+    try:
+        cursor = db_connection.cursor(cursorclass=MySQLdb.cursors.DictCursor)
+    except Exception, e:
+        module.fail_json(msg="Trouble getting DictCursor from db_connection: %s" % e)
 
     if mode in "getmaster":
         masterstatus = get_master_status(cursor)
         try:
-            module.exit_json(
-                File=masterstatus[0],
-                Position=masterstatus[1],
-                Binlog_Do_DB=masterstatus[2],
-                Binlog_Ignore_DB=masterstatus[3]
-            )
-        except TypeError:
-            module.fail_json(msg="Server is not configured as mysql master")
+            module.exit_json( **masterstatus )
+        except TypeError, e:
+            module.fail_json(msg="Server is not configured as mysql master: %s" % e)
 
     elif mode in "getslave":
         slavestatus = get_slave_status(cursor)
         try:
-            module.exit_json(
-                Slave_IO_State=slavestatus[0],
-                Master_Host=slavestatus[1],
-                Master_User=slavestatus[2],
-                Master_Port=slavestatus[3],
-                Connect_Retry=slavestatus[4],
-                Master_Log_File=slavestatus[5],
-                Read_Master_Log_Pos=slavestatus[6],
-                Relay_Log_File=slavestatus[7],
-                Relay_Log_Pos=slavestatus[8],
-                Relay_Master_Log_File=slavestatus[9],
-                Slave_IO_Running=slavestatus[10],
-                Slave_SQL_Running=slavestatus[11],
-                Replicate_Do_DB=slavestatus[12],
-                Replicate_Ignore_DB=slavestatus[13],
-                Replicate_Do_Table=slavestatus[14],
-                Replicate_Ignore_Table=slavestatus[15],
-                Replicate_Wild_Do_Table=slavestatus[16],
-                Replicate_Wild_Ignore_Table=slavestatus[17],
-                Last_Errno=slavestatus[18],
-                Last_Error=slavestatus[19],
-                Skip_Counter=slavestatus[20],
-                Exec_Master_Log_Pos=slavestatus[21],
-                Relay_Log_Space=slavestatus[22],
-                Until_Condition=slavestatus[23],
-                Until_Log_File=slavestatus[24],
-                Until_Log_Pos=slavestatus[25],
-                Master_SSL_Allowed=slavestatus[26],
-                Master_SSL_CA_File=slavestatus[27],
-                Master_SSL_CA_Path=slavestatus[28],
-                Master_SSL_Cert=slavestatus[29],
-                Master_SSL_Cipher=slavestatus[30],
-                Master_SSL_Key=slavestatus[31],
-                Seconds_Behind_Master=slavestatus[32],
-                Master_SSL_Verify_Server_Cert=slavestatus[33],
-                Last_IO_Errno=slavestatus[34],
-                Last_IO_Error=slavestatus[35],
-                Last_SQL_Errno=slavestatus[36],
-                Last_SQL_Error=slavestatus[37],
-                Replicate_Ignore_Server_Ids=slavestatus[38],
-                Master_Server_Id=slavestatus[39]
-            )
-        except TypeError:
-            module.fail_json(msg="Server is not configured as mysql slave")
+            module.exit_json( **slavestatus )
+        except TypeError, e:
+            module.fail_json(msg="Server is not configured as mysql slave: %s" % e)
 
     elif mode in "changemaster":
         print "Change master"

From 345329b69f523ac25c30d7f813e6b907cb63d6ac Mon Sep 17 00:00:00 2001
From: Dylan Martin <dmartin@sccd.ctc.edu>
Date: Thu, 10 Oct 2013 09:15:47 -0700
Subject: [PATCH 2/2] toned down the error message for unconfigured
 master/slave

---
 library/database/mysql_replication | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/library/database/mysql_replication b/library/database/mysql_replication
index 59116dab23..80ecf449f8 100644
--- a/library/database/mysql_replication
+++ b/library/database/mysql_replication
@@ -305,15 +305,15 @@ def main():
         masterstatus = get_master_status(cursor)
         try:
             module.exit_json( **masterstatus )
-        except TypeError, e:
-            module.fail_json(msg="Server is not configured as mysql master: %s" % e)
+        except TypeError:
+            module.fail_json(msg="Server is not configured as mysql master")
 
     elif mode in "getslave":
         slavestatus = get_slave_status(cursor)
         try:
             module.exit_json( **slavestatus )
-        except TypeError, e:
-            module.fail_json(msg="Server is not configured as mysql slave: %s" % e)
+        except TypeError:
+            module.fail_json(msg="Server is not configured as mysql slave")
 
     elif mode in "changemaster":
         print "Change master"