From caba7e2782fd6c39873fcb05059ad0bdb037a2aa Mon Sep 17 00:00:00 2001
From: Clinton Ebadi <clinton@unknownlamer.org>
Date: Wed, 1 Dec 2010 01:49:36 -0500
Subject: [PATCH] Move Mysql-fixperms into slave * Occurs on dbmsNode as with
 other database operations

---
 src/main.sml | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/main.sml b/src/main.sml
index cf53af0..2800cbd 100644
--- a/src/main.sml
+++ b/src/main.sml
@@ -735,7 +735,9 @@ fun requestSmtpLog domain =
 
 fun requestMysqlFixperms () =
     let
-	val (_, bio) = requestBio (fn () => ())
+	val (_, context) = requestContext (fn () => ())
+	val bio = OpenSSL.connect true (context,
+					Config.Dbms.dbmsNode ^ ":" ^ Int.toString Config.slavePort)
     in
 	Msg.send (bio, MsgMysqlFixperms);
 	case Msg.recv bio of
@@ -1505,18 +1507,6 @@ fun service () =
 						 (describeQuery q,
 						  NONE)))
 				      (fn () => ())
-
-			       | MsgMysqlFixperms =>
-				 (print "Starting mysql-fixperms\n";
-				  doIt (fn () => if OS.Process.isSuccess
-							(OS.Process.system "/usr/bin/sudo -H /afs/hcoop.net/common/etc/scripts/mysql-grant-table-drop") then
-						     ("Requested mysql-fixperms",
-						      NONE)
-						 else
-						     ("Requested mysql-fixperms, but execution failed!",
-						      SOME "Script execution failed."))
-				       (fn () => ()))
-
 			       | MsgDescribe dom =>
 				 doIt (fn () => if not (Domain.validDomain dom) then
 						    ("Requested description of invalid domain " ^ dom,
@@ -1745,6 +1735,17 @@ fun slave () =
 						  ("Invalid database name " ^ user ^ "_" ^ dbname,
 						   SOME ("Invalid database name " ^ dbname)))
 					  (fn () => ())
+				   | MsgMysqlFixperms =>
+				     (print "Starting mysql-fixperms\n";
+				      doIt (fn () => if OS.Process.isSuccess
+							    (OS.Process.system "/usr/bin/sudo -H /afs/hcoop.net/common/etc/scripts/mysql-grant-table-drop") then
+							 ("Requested mysql-fixperms",
+							  NONE)
+						     else
+							 ("Requested mysql-fixperms, but execution failed!",
+							  SOME "Script execution failed."))
+					   (fn () => ()))
+
 				   | _ => (OpenSSL.close bio;
 					   loop ())
 			 end
-- 
2.20.1