Client should not block multiple times on the same key.

[redis.git] / utils / install_server.sh

diff --git a/utils/install_server.sh b/utils/install_server.sh
index 5ba8e941d949d5297b8b9e0a5116bd257c8e1ed8..789a97803c28d44709da7dd7eaf80e6b8384b2c3 100755 (executable)
--- a/utils/install_server.sh
+++ b/utils/install_server.sh
@@ -1,42 +1,39 @@
-#! /bin/sh
+#!/bin/sh

 
 # Copyright 2011 Dvir Volk <dvirsk at gmail dot com>. All rights reserved.
 #
 
 # Copyright 2011 Dvir Volk <dvirsk at gmail dot com>. All rights reserved.
 #

-# Redistribution and use in source and binary forms, with or without modification, are
-# permitted provided that the following conditions are met:
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:

 #
 #

-#   1. Redistributions of source code must retain the above copyright notice, this list of
-#      conditions and the following disclaimer.
+#   1. Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.

 #
 #

-#   2. Redistributions in binary form must reproduce the above copyright notice, this list
-#      of conditions and the following disclaimer in the documentation and/or other materials
-#      provided with the distribution.
+#   2. Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.

 #
 # THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
 #
 # THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED

-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL Dvir Volk OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL Dvir Volk OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+# OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+# EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 #
 #

-#
-# # # # # # # # # # # # # # # # # # # # # # # # # #
+################################################################################

 #
 # Interactive service installer for redis server
 # this generates a redis config file and an /etc/init.d script, and installs them
 # this scripts should be run as root
 #
 # Interactive service installer for redis server
 # this generates a redis config file and an /etc/init.d script, and installs them
 # this scripts should be run as root

-#
-

 
 die () {
        echo "ERROR: $1. Aborting!" 
        exit 1
 }
 
 
 die () {
        echo "ERROR: $1. Aborting!" 
        exit 1
 }
 

-

 #Initial defaults
 _REDIS_PORT=6379
 
 #Initial defaults
 _REDIS_PORT=6379
 


@@ -51,6 +48,7 @@ if [ `whoami` != "root" ] ; then
        exit 1
 fi
 
        exit 1
 fi
 

+

 #Read the redis port
 read  -p "Please select the redis port for this instance: [$_REDIS_PORT] " REDIS_PORT 
 if [ ! `echo $REDIS_PORT | egrep "^[0-9]+\$"`  ] ; then
 #Read the redis port
 read  -p "Please select the redis port for this instance: [$_REDIS_PORT] " REDIS_PORT 
 if [ ! `echo $REDIS_PORT | egrep "^[0-9]+\$"`  ] ; then


@@ -102,7 +100,7 @@ fi
 
 #render the tmplates
 TMP_FILE="/tmp/$REDIS_PORT.conf"
 
 #render the tmplates
 TMP_FILE="/tmp/$REDIS_PORT.conf"

-TPL_FILE="./redis.conf.tpl"
+DEFAULT_CONFIG="../redis.conf"

 INIT_TPL_FILE="./redis_init_script.tpl"
 INIT_SCRIPT_DEST="/etc/init.d/redis_$REDIS_PORT"
 PIDFILE="/var/run/redis_$REDIS_PORT.pid"
 INIT_TPL_FILE="./redis_init_script.tpl"
 INIT_SCRIPT_DEST="/etc/init.d/redis_$REDIS_PORT"
 PIDFILE="/var/run/redis_$REDIS_PORT.pid"


@@ -115,9 +113,19 @@ if [ ! "$CLI_EXEC" ] ; then
        CLI_EXEC=`dirname $REDIS_EXECUTABLE`"/redis-cli"
 fi
 
        CLI_EXEC=`dirname $REDIS_EXECUTABLE`"/redis-cli"
 fi
 

-#Generate config file from template
+#Generate config file from the default config file as template
+#changing only the stuff we're controlling from this script

 echo "## Generated by install_server.sh ##" > $TMP_FILE
 echo "## Generated by install_server.sh ##" > $TMP_FILE

-cat $TPL_FILE | while read line; do eval "echo \"$line\"" >> $TMP_FILE; done
+
+SED_EXPR="s#^port [0-9]{4}\$#port ${REDIS_PORT}#;\
+s#^logfile .+\$#logfile ${REDIS_LOG_FILE}#;\
+s#^dir .+\$#dir ${REDIS_DATA_DIR}#;\
+s#^pidfile .+\$#pidfile ${PIDFILE}#;\
+s#^daemonize no\$#daemonize yes#;" 
+echo $SED_EXPR
+sed -r "$SED_EXPR" $DEFAULT_CONFIG  >> $TMP_FILE
+
+#cat $TPL_FILE | while read line; do eval "echo \"$line\"" >> $TMP_FILE; done

 cp -f $TMP_FILE $REDIS_CONFIG_FILE || exit 1
 
 #Generate sample script from template file
 cp -f $TMP_FILE $REDIS_CONFIG_FILE || exit 1
 
 #Generate sample script from template file


@@ -149,9 +157,9 @@ REDIS_CHKCONFIG_INFO=\
 # Description: Redis daemon\n
 ### END INIT INFO\n\n"
 
 # Description: Redis daemon\n
 ### END INIT INFO\n\n"
 

-if [[ ! `which chkconfig` ]] ; then 
+if [ !`which chkconfig` ] ; then 

        #combine the header and the template (which is actually a static footer)
        #combine the header and the template (which is actually a static footer)

-       echo -e $REDIS_INIT_HEADER > $TMP_FILE && cat $INIT_TPL_FILE >> $TMP_FILE || die "Could not write init script to $TMP_FILE"
+       echo $REDIS_INIT_HEADER > $TMP_FILE && cat $INIT_TPL_FILE >> $TMP_FILE || die "Could not write init script to $TMP_FILE"

 else
        #if we're a box with chkconfig on it we want to include info for chkconfig
        echo -e $REDIS_INIT_HEADER $REDIS_CHKCONFIG_INFO > $TMP_FILE && cat $INIT_TPL_FILE >> $TMP_FILE || die "Could not write init script to $TMP_FILE"
 else
        #if we're a box with chkconfig on it we want to include info for chkconfig
        echo -e $REDIS_INIT_HEADER $REDIS_CHKCONFIG_INFO > $TMP_FILE && cat $INIT_TPL_FILE >> $TMP_FILE || die "Could not write init script to $TMP_FILE"


@@ -163,13 +171,13 @@ echo "Copied $TMP_FILE => $INIT_SCRIPT_DEST"
 
 #Install the service
 echo "Installing service..."
 
 #Install the service
 echo "Installing service..."

-if [[ ! `which chkconfig` ]] ; then 
+if [ !`which chkconfig` ] ; then 

        #if we're not a chkconfig box assume we're able to use update-rc.d
        update-rc.d redis_$REDIS_PORT defaults && echo "Success!"
 else
        # we're chkconfig, so lets add to chkconfig and put in runlevel 345
        chkconfig --add redis_$REDIS_PORT && echo "Successfully added to chkconfig!"
        #if we're not a chkconfig box assume we're able to use update-rc.d
        update-rc.d redis_$REDIS_PORT defaults && echo "Success!"
 else
        # we're chkconfig, so lets add to chkconfig and put in runlevel 345
        chkconfig --add redis_$REDIS_PORT && echo "Successfully added to chkconfig!"

-       chkconfig--level 345 redis_$REDIS_PORT on && echo "Successfully added to runlevels 345!"
+       chkconfig --level 345 redis_$REDIS_PORT on && echo "Successfully added to runlevels 345!"

 fi
        
 /etc/init.d/redis_$REDIS_PORT start || die "Failed starting service..."
 fi
        
 /etc/init.d/redis_$REDIS_PORT start || die "Failed starting service..."


@@ -178,6 +186,3 @@ fi
 echo "Installation successful!"
 exit 0
 
 echo "Installation successful!"
 exit 0
 

-
-
-