X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=handlers%2Fmysql;h=6fd50562998ed648ea91cfbc2e105e6befecc0fb;hb=5170e0759864acba531626f062b8bd231c1def81;hp=9cf3c3d3f595e3281bd7837952fc5080f84a5264;hpb=44d16aaa322bf493a7d872d18873d2f47cfcf0ab;p=matthijs%2Fupstream%2Fbackupninja-vserver.git

diff --git a/handlers/mysql b/handlers/mysql
index 9cf3c3d..6fd5056 100644
--- a/handlers/mysql
+++ b/handlers/mysql
@@ -59,7 +59,7 @@ else
 	    then
 	    	fatal "User $user not found in /etc/passwd"
 	    fi
-    	    userhome="$VROOTDIR/$vsname$userhome"
+    	    userhome="$vroot$userhome"
 	    info "User home set to: $userhome"
 	    [ -f $userhome/.my.cnf ] || fatal "Can't find config file in $userhome/.my.cnf"
 	else
@@ -81,8 +81,8 @@ for i in $ignores; do
        ignore="$ignore --ignore-table=$i"
 done
 	
-# create backup dirs, vroot variable will be empty if no vsname was specified
-# and will proceed to operate on the host
+# create backup dirs, $vroot will be empty if no vsname was specified
+# and we will instead proceed to operate on the host
 [ -d $vroot$backupdir ] || mkdir -p $vroot$backupdir
 [ -d $vroot$backupdir ] || fatal "Backup directory '$vroot$backupdir'"
 hotdir="$backupdir/hotcopy"
@@ -120,8 +120,11 @@ then
     if [ $usevserver ]
     then
     	home=`$VSERVER $vsname exec getent passwd "root" | awk -F: '{print $6}'`
+	home="$vroot$home"
+	info "Home set to: $home"
     else
     	home=`getent passwd "root" | awk -F: '{print $6}'`
+	info "Home set to: $home"
     fi
     [ -d $home ] || fatal "Can't find root's home directory ($home)."
     mycnf="$home/.my.cnf"
@@ -151,79 +154,91 @@ EOF
 	umask $oldmask
 	defaultsfile="--defaults-file=$mycnf"
 elif [ "$userset" == "false" ]; then
-	# if user is set, don't use $configfile
+	# if user is set, don't use $mycnf
 	defaultsfile="--defaults-file=$configfile"
 fi
 
 #######################################################################
 ## HOT COPY
 
-if [ "$hotcopy" == "yes" ]; then 
-	if [ "$databases" == "all" ]; then
+if [ "$hotcopy" == "yes" ]
+then
+    info "Initializing hotcopy method"
+    if [ "$databases" == "all" ]
+    then
+	if [ $usevserver ]
+	then
+		execstr="$VSERVER $vsname exec $MYSQLHOTCOPY --quiet --allowold --regexp /.\*/./.\*/ $hotdir"
+	else
+		execstr="$MYSQLHOTCOPY --quiet --allowold --regexp /.\*/./.\*/ $hotdir"
+	fi
+	debug "su $user -c '$execstr'"
+	if [ ! $test ]
+	then
+		output=`su $user -c "$execstr" 2>&1`
+		code=$?
+		if [ "$code" == "0" ]
+		then
+			debug $output
+			info "Successfully finished hotcopy of all mysql databases"
+		else
+			warning $output
+			warning "Failed to hotcopy all mysql databases"
+		fi
+	fi
+    else	
+	for db in $databases
+	do
 		if [ $usevserver ]
 		then
-			execstr="$VSERVER $vsname exec $MYSQLHOTCOPY --quiet --allowold --regexp /.\*/./.\*/ $hotdir"
+			execstr="$VSERVER $vsname exec $MYSQLHOTCOPY --allowold $db $hotdir"
 		else
-			execstr="$MYSQLHOTCOPY --quiet --allowold --regexp /.\*/./.\*/ $hotdir"
+			execstr="$MYSQLHOTCOPY --allowold $db $hotdir"
 		fi
 		debug "su $user -c '$execstr'"
-		if [ ! $test ]; then
+		if [ ! $test ]
+		then
 			output=`su $user -c "$execstr" 2>&1`
 			code=$?
-			if [ "$code" == "0" ]; then
+			if [ "$code" == "0" ]
+			then
 				debug $output
-				info "Successfully finished hotcopy of all mysql databases"
+				info "Successfully finished hotcopy of mysql database $db"
 			else
 				warning $output
-				warning "Failed to hotcopy all mysql databases"
+				warning "Failed to hotcopy mysql database $db"
 			fi
 		fi
-	else	
-		for db in $databases; do
-			if [ $usevserver ]
-			then
-				execstr="$VSERVER $vsname exec $MYSQLHOTCOPY --allowold $db $hotdir"
-			else
-				execstr="$MYSQLHOTCOPY --allowold $db $hotdir"
-			fi
-			debug "su $user -c '$execstr'"
-			if [ ! $test ]; then
-				output=`su $user -c "$execstr" 2>&1`
-				code=$?
-				if [ "$code" == "0" ]; then
-					debug $output
-					info "Successfully finished hotcopy of mysql database $db"
-				else
-					warning $output
-					warning "Failed to hotcopy mysql database $db"
-				fi
-			fi
-		done
-	fi
+	done
+     fi
 fi
 
 ##########################################################################
 ## SQL DUMP
 
-if [ "$sqldump" == "yes" ]; then
-	if [ "$databases" == "all" ]; then
-		if [ $usevserver ]
+if [ "$sqldump" == "yes" ]
+then
+    info "Initializing SQL dump method"
+    if [ "$databases" == "all" ]
+    then
+	if [ $usevserver ]
+	then
+		databases=`echo 'show databases' | $VSERVER $vsname exec su $user -c "$MYSQL $defaultsfile" | grep -v Database`
+		if [ $? -ne 0 ]
 		then
-			databases=`echo 'show databases' | $VSERVER $vsname exec su $user -c "$MYSQL $defaultsfile" | grep -v Database`
-			if [ $? -ne 0 ]
-			then
-			    fatal "Something unexpected happened, the defaults file may have gone missing or is corrupt"
-			fi
-		else
-			databases=`echo 'show databases' | su $user -c "$MYSQL $defaultsfile" | grep -v Database`
-			if [ $? -ne 0 ]
-			then
-			    fatal "Something unexpected happened, the defaults file may have gone missing or is corrupt"
-			fi
+		    fatal "Something unexpected happened, the defaults file may have gone missing or is corrupt"
+		fi
+	else
+		databases=`echo 'show databases' | su $user -c "$MYSQL $defaultsfile" | grep -v Database`
+		if [ $? -ne 0 ]
+		then
+		    fatal "Something unexpected happened, the defaults file may have gone missing or is corrupt"
 		fi
 	fi
+fi
 
-	for db in $databases; do
+	for db in $databases
+	do
 		if [ $usevserver ]
 		then
 			execstr="$VSERVER $vsname exec $MYSQLDUMP $defaultsfile --lock-tables --complete-insert --add-drop-table --quick --quote-names $ignore $db > $vroot$dumpdir/${db}.sql"
@@ -231,10 +246,12 @@ if [ "$sqldump" == "yes" ]; then
 			execstr="$MYSQLDUMP $defaultsfile --lock-tables --complete-insert --add-drop-table --quick --quote-names $ignore $db > $dumpdir/${db}.sql"
 		fi
 		debug "su $user -c '$execstr'"
-		if [ ! $test ]; then
+		if [ ! $test ]
+		then
 			output=`su $user -c "$execstr" 2>&1`
 			code=$?
-			if [ "$code" == "0" ]; then
+			if [ "$code" == "0" ]
+			then
 				debug $output
 				info "Successfully finished dump of mysql database $db"
 			else
@@ -244,18 +261,21 @@ if [ "$sqldump" == "yes" ]; then
 		fi
 	done
 	
-	if [ "$compress" == "yes" ]; then
+	if [ "$compress" == "yes" ]
+	then
 		output=`$GZIP -f $vroot$dumpdir/*.sql 2>&1`
 		debug $output
 	fi
 fi
 
 # clean up tmp config file
-if [ "$dbusername" != "" ]; then
+if [ "$dbusername" != "" ]
+then
 	## clean up tmp config file
 	debug "rm $mycnf"
 	rm $mycnf
-	if [ -f "$tmpcnf" ]; then
+	if [ -f "$tmpcnf" ]
+	then
 		debug "mv $tmpcnf $mycnf"
 		mv $tmpcnf $mycnf
 	fi