[Swift-commit] r4498 - usertools/persistent-coasters

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2011-05-19 11:40:47 -0500 (Thu, 19 May 2011)
New Revision: 4498

Modified:
   usertools/persistent-coasters/settings.sh
   usertools/persistent-coasters/start-service.zsh
Log:
Added variable to location of coaster-service if not in path


Modified: usertools/persistent-coasters/settings.sh
===================================================================
--- usertools/persistent-coasters/settings.sh	2011-05-19 16:30:49 UTC (rev 4497)
+++ usertools/persistent-coasters/settings.sh	2011-05-19 16:40:47 UTC (rev 4498)
@@ -2,8 +2,9 @@
 # Keep all interesting settings in one place
 # User should modify this to fit environment
 
-# Location of SWIFT.  If empty, PATH is referenced
+# Location of SWIFT and COASTER_SERVICE.  If empty, PATH is referenced
 export SWIFT=
+export COASTER_SERVICE=
 
 # Where to place/launch worker.pl on the remote machine for sites.xml
 export WORKER_WORK=/home/${USER}/work

Modified: usertools/persistent-coasters/start-service.zsh
===================================================================
--- usertools/persistent-coasters/start-service.zsh	2011-05-19 16:30:49 UTC (rev 4497)
+++ usertools/persistent-coasters/start-service.zsh	2011-05-19 16:40:47 UTC (rev 4498)
@@ -16,6 +16,7 @@
 [[ ${SWIFT} == "" ]] && SWIFT=$( which swift )
 SWIFT_BIN=$( dirname ${SWIFT} )
 WORKER=${SWIFT_BIN}/worker.pl
+[[ ${COASTER_SERVICE} == "" ]] && COASTER_SERVICE=$( which coaster-service )
 
 # This is an arbitrary port number
 export SERVICE_PORT=10985
@@ -104,7 +105,7 @@
 # eval trap cleanup_trap ${SIGNALS}
 
 SERVICE_LOG=${LOGDIR}/coaster-service.log
-coaster-service -nosec -p ${SERVICE_PORT} >& ${SERVICE_LOG} &
+$COASTER_SERVICE -nosec -p ${SERVICE_PORT} >& ${SERVICE_LOG} &
 COASTER_SERVICE_PID=${!}
 
 sleep 1