Update of /home/cvsd/slony1/slony1-engine/tools
In directory main.slony.info:/tmp/cvs-serv22539

Modified Files:
	start_slon.sh 
Log Message:
Regularize the styles of output messages.

Add a check that the log file location is writable.


Index: start_slon.sh
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tools/start_slon.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** start_slon.sh	15 Jul 2008 22:28:23 -0000	1.1
--- start_slon.sh	1 Aug 2008 19:33:24 -0000	1.2
***************
*** 8,12 ****
  SLON_BIN_PATH=${SLON_BUILD:-"/home/chris/dbs/postgresql-8.3.3/bin"}
  SLON_CONF=${SLON_CONF:-"${HOME}/test/slon-conf.1"}
! SLON_LOG=${SLON_LOG:-"${HOME}/test/slon.1.log"}
  
  # shouldn't need to edit anything below this
--- 8,12 ----
  SLON_BIN_PATH=${SLON_BUILD:-"/home/chris/dbs/postgresql-8.3.3/bin"}
  SLON_CONF=${SLON_CONF:-"${HOME}/test/slon-conf.1"}
! SLON_LOG=${SLON_LOG:-"${HOME}/test/slon.1.log"}    # If you use syslog, then this may use /dev/null
  
  # shouldn't need to edit anything below this
***************
*** 30,36 ****
    start)
          if [ ! -z "$FINDPID" ]; then
! 	    echo "**** slon still running - PID $PID ****"
  	    exit 1
  	fi
          echo "Starting slon: $SLON_BIN_PATH/slon -f ${SLON_CONF} 1>> ${SLON_LOG} 2>>1" &
  	$SLON_BIN_PATH/slon -f ${SLON_CONF} 1>> ${SLON_LOG} 2>>1 &
--- 30,38 ----
    start)
          if [ ! -z "$FINDPID" ]; then
! 	    echo "**** slon already running - PID $PID ****"
  	    exit 1
  	fi
+ 	touch $SLON_LOG
+ 	test -w "$SLON_LOG" || (echo "**** SLON_LOG not writable - $SLON_LOG ****"; exit 1)
          echo "Starting slon: $SLON_BIN_PATH/slon -f ${SLON_CONF} 1>> ${SLON_LOG} 2>>1" &
  	$SLON_BIN_PATH/slon -f ${SLON_CONF} 1>> ${SLON_LOG} 2>>1 &
***************
*** 40,45 ****
  	if [ ! -z "$FINDPID" ]; then
  	    kill -15 ${PID}
  	else
! 	    echo "slon with PID ${PID} not found"
          fi
          ;;
--- 42,48 ----
  	if [ ! -z "$FINDPID" ]; then
  	    kill -15 ${PID}
+ 	    echo "Killed slon at PID ${PID}"
  	else
! 	    echo "**** slon with PID ${PID} not found ****"
          fi
          ;;
***************
*** 49,58 ****
  	if [ -f $PID_FILE ]; then
  	    if [ ! -z "$FINDPID" ]; then
! 		echo "Slon running as PID:$PID"
  	    else
! 		echo "Slon not running - PID:$PID - ${FINDPID}"
  	    fi
  	else
! 	    echo "Slon not running - no PID file ${PID_FILE}"
  	fi
  	;;
--- 52,61 ----
  	if [ -f $PID_FILE ]; then
  	    if [ ! -z "$FINDPID" ]; then
! 		echo "**** Slon running as PID:$PID ****"
  	    else
! 		echo "**** Slon not running - PID:$PID - ${FINDPID} ****"
  	    fi
  	else
! 	    echo "**** Slon not running - no PID file ${PID_FILE} ****"
  	fi
  	;;