--- mongrel-cluster.orig	2009-07-24 15:29:53.000000000 -0400
+++ mongrel-cluster	2009-07-24 15:53:32.000000000 -0400
@@ -20,6 +20,8 @@
 #
 # Debianized by Filipe Lautert, filipe@icewall.org
 
+set -e
+
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/sbin/mongrel_cluster_ctl
 NAME=mongrel-cluster
@@ -31,14 +33,15 @@
 PID_DIR=/var/run/mongrel-cluster
 USER=www-data
 GROUP=www-data
-DAEMON_OPTS="-c $CONF_DIR"
+DAEMON_OPTS="-c $CONF_DIR --quiet"
 
 # Include mongrel-cluster defaults if available
 if [ -f /etc/default/mongrel-cluster ] ; then
 	. /etc/default/mongrel-cluster
 fi
 
-set -e
+
+. /lib/lsb/init-functions
 
 # if we do not hae configuration files, skip the script
 TOTAL_CONFS=$(ls $CONF_DIR | wc -l)
@@ -48,34 +51,46 @@
   start)
 	mkdir -p $PID_DIR
         chown $USER:$GROUP $PID_DIR
-	echo -n "Starting $DESC: "
-	start-stop-daemon --start --quiet --chuid $USER:$GROUP \
-		--exec $DAEMON -- start $DAEMON_OPTS
-	echo "$NAME."
+	log_daemon_msg "Starting $DESC "
+	if start-stop-daemon --start --quiet --chuid $USER:$GROUP \
+		--exec $DAEMON -- start $DAEMON_OPTS ; then
+		log_end_msg 0
+	else
+		log_end_msg 1
+	fi
 	;;
   stop)
-	echo -n "Stopping $DESC: "
-	start-stop-daemon --start --quiet --chuid $USER:$GROUP \
-		--exec $DAEMON -- stop $DAEMON_OPTS
-	echo "$NAME."
+	log_daemon_msg "Stopping $DESC "
+	if start-stop-daemon --start --quiet --chuid $USER:$GROUP \
+		--exec $DAEMON -- stop $DAEMON_OPTS ; then
+		log_end_msg 0
+	else
+		log_end_msg 1
+	fi
 	;;
   restart)
-	echo -n "Restarting $DESC: "
-	start-stop-daemon --start --quiet --chuid $USER:$GROUP \
-		--exec $DAEMON -- restart $DAEMON_OPTS
-	echo "$NAME."
+	log_daemon_msg "Restarting $DESC "
+	if start-stop-daemon --start --quiet --chuid $USER:$GROUP \
+		--exec $DAEMON -- restart $DAEMON_OPTS ; then
+		log_end_msg 0
+	else
+		log_end_msg 1
+	fi
 	;;
   status)
-	echo -n "Status for $DESC: "
+	log_daemon_msg "Status for $DESC "
 	start-stop-daemon --start --quiet --chuid $USER:$GROUP \
 		--exec $DAEMON -- status $DAEMON_OPTS
 	;;
   # actually jus calling restart
   force-reload)
-	echo -n "Restarting $DESC: "
-	start-stop-daemon --start --quiet --chuid $USER:$GROUP \
-		--exec $DAEMON -- restart $DAEMON_OPTS
-	echo "$NAME."
+	log_daemon_msg "Restarting $DESC "
+	if start-stop-daemon --start --quiet --chuid $USER:$GROUP \
+		--exec $DAEMON -- restart $DAEMON_OPTS ; then
+		log_end_msg 0
+	else
+		log_end_msg 1
+	fi
 	;;
   *)
 	N=/etc/init.d/$NAME