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

Modified Files:
	run_test.sh 
Log Message:
Add in new tools script, start_slon.sh, which provides an rc.d-style
way of starting up a slon.

Altered the test scripts to make use of it.

Still need to update docs to discuss it at least a little bit.


Index: run_test.sh
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tests/run_test.sh,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** run_test.sh	7 Jul 2008 21:16:03 -0000	1.24
--- run_test.sh	15 Jul 2008 22:28:22 -0000	1.25
***************
*** 113,121 ****
  	node=1
          while : ; do
!           eval slonpid=\$slon${node}_pid
! 	  if [ ! -z $slonpid ]; then
!             echo "**** killing slon node $node"
!             kill -15 $slonpid
! 	  fi
            if [ ${node} -ge ${NUMNODES} ]; then
              break;
--- 113,117 ----
  	node=1
          while : ; do
! 	  SLON_BIN_PATH=$PGBINDIR1 SLON_CONF=${mktmp}/slon-conf.${node} $SLTOOLDIR/start_slon.sh stop
            if [ ${node} -ge ${NUMNODES} ]; then
              break;
***************
*** 526,550 ****
    eval opgbindir=\$PGBINDIR${originnode}
    eval oport=\$PORT${originnode}
-   eval oslonconf=\$SLONCONF${originnode}
    eval cluster=\$CLUSTER1
  
    conninfo="dbname=${odb} host=${ohost} user=${ouser} port=${oport}"
!   if [ "x${slonconf}" = "xtrue" ]; then
!       build_slonconf ${originnode} "${conninfo}"
!       slonparms=" -f ${mktmp}/slon-conf.${originnode} "
!       status "launching originnode : $opgbindir/slon ${slonparms}"
!       $opgbindir/slon -f ${mktmp}/slon-conf.${originnode} 1> $mktmp/slon_log.${originnode} 2> $mktmp/slon_log.${originnode} &
!   else
!       slonparms=" -s500 -g10 -d2 $cluster \"$conninfo\""
!       status "launching originnode : $opgbindir/slon ${slonparms}"
!       $opgbindir/slon -s500 -g10 -d2 $cluster "$conninfo" 1> $mktmp/slon_log.${originnode} 2> $mktmp/slon_log.${originnode} &
!   fi
!   tmppid=$!
!   tmpppid=$$
    sleep 1
!   foo=$(_check_pid slon ${tmppid} ${tmpppid})
!           
!   eval slon${originnode}_pid=${foo}
!   if [ -z "${foo}" -o "${tmppid}" != "${foo}" ]; then
      warn 3 "Failed to launch slon on node ${originnode} check $mktmp/slon_log.${originnode} for details"
    fi
--- 522,537 ----
    eval opgbindir=\$PGBINDIR${originnode}
    eval oport=\$PORT${originnode}
    eval cluster=\$CLUSTER1
  
    conninfo="dbname=${odb} host=${ohost} user=${ouser} port=${oport}"
!   build_slonconf ${originnode} "${conninfo}"
!   slonparms=" -f ${mktmp}/slon-conf.${originnode} "
!   status "launching originnode"
!   SLON_BIN_PATH=${opgbindir} SLON_CONF=${mktmp}/slon-conf.${originnode}  SLON_LOG=$mktmp/slon_log.${originnode} $SLTOOLDIR/start_slon.sh start
! 
    sleep 1
!   SLPID=`SLON_BIN_PATH=${opgbindir} SLON_CONF=${mktmp}/slon-conf.${originnode} $SLTOOLDIR/start_slon.sh status | grep "Slon running as PID:"`
!   if [ -z "${SLPID}" ]; then
!       echo "SLPID: ${SLPID}"
      warn 3 "Failed to launch slon on node ${originnode} check $mktmp/slon_log.${originnode} for details"
    fi
***************
*** 577,581 ****
        eval cluster=\$CLUSTER1
        eval archive=\$ARCHIVE${node}
-       eval slonconf=\$SLONCONF${node}
  
        if [ -n "${db}" -a "${host}" -a "${user}" -a "${port}" ]; then
--- 564,567 ----
***************
*** 595,615 ****
          conninfo="dbname=${db} host=${host} user=${user} port=${port}"
  
! 	if [ "x${slonconf}" = "xtrue" ]; then
! 	    build_slonconf ${node} "${conninfo}"
! 	    status "launching: $pgbindir/slon -f ${CONFFILE}"
! 	    $pgbindir/slon -f ${CONFFILE} 1>> $mktmp/slon_log.${node} 2>&1 &
! 	else
! 	    status "launching: $pgbindir/slon -s500 -g10 -d2 ${archiveparm} $cluster \"$conninfo\""
! 	    $pgbindir/slon -s500 -g10 -d2 ${archiveparm} $cluster "$conninfo" 1>> $mktmp/slon_log.${node} 2>&1 &
! 	fi
! 	tmppid=$!
! 	tmpppid=$$
  	sleep 1
  	
! 	foo=$(_check_pid slon ${tmppid} ${tmpppid})
! 	
! 	eval slon${node}_pid=${foo}
! 	if [ -z "${foo}" -o "${tmppid}" != "${foo}" ]; then
!             warn 3 "Failed to launch slon on node ${node} check $mktmp/slon_log.${node} for details"
  	fi
        fi
--- 581,593 ----
          conninfo="dbname=${db} host=${host} user=${user} port=${port}"
  
! 	build_slonconf ${node} "${conninfo}"
! 	status "launching slon"
! 	SLON_BIN_PATH=$pgbindir SLON_CONF=${CONFFILE} SLON_LOG=$mktmp/slon_log.${node} $SLTOOLDIR/start_slon.sh start
  	sleep 1
  	
! 	SLPID=`SLON_BIN_PATH=${pgbindir} SLON_CONF=${mktmp}/slon-conf.${node} $SLTOOLDIR/start_slon.sh status | grep "Slon running as PID:"`
! 	if [ -z "${SLPID}" ]; then
! 	    echo "SLPID: ${SLPID}"
! 	    warn 3 "Failed to launch slon on node ${node} check $mktmp/slon_log.${node} for details"
  	fi
        fi