[Swift-commit] r7641 - branches/release-0.94/bin

[ketan at ci.uchicago.edu]

Author: ketan
Date: 2014-03-07 16:41:45 -0600 (Fri, 07 Mar 2014)
New Revision: 7641

Modified:
   branches/release-0.94/bin/start-coaster-service
Log:
adding additional env var to conf

Modified: branches/release-0.94/bin/start-coaster-service
===================================================================
--- branches/release-0.94/bin/start-coaster-service	2014-03-07 22:26:53 UTC (rev 7640)
+++ branches/release-0.94/bin/start-coaster-service	2014-03-07 22:41:45 UTC (rev 7641)
@@ -86,6 +86,7 @@
    esac
 done
 
+
 # Determine the location of needed files
 export SWIFT_BIN="$( cd "$( dirname "$0" )" && pwd )"
 if [ -z "$WORKER" ]; then
@@ -95,6 +96,7 @@
 export PID_FILE="$HOME/.swift/.coaster-service-pids"
 export COASTER_SERVICE="$SWIFT_BIN/coaster-service"
 export LOG="start-coaster-service.log"
+
 mkdir -p "$HOME/.swift" || crash "Unable to create $HOME/.swift"
 
 # Import settings
@@ -106,6 +108,12 @@
    crash "Cannot find coaster-service.conf!"
 fi
 
+#clean up coaster conf
+sed -i '/export WORKERURL=/d' $CONFIG_FILE
+sed -i '/export PID_FILE=/d' $CONFIG_FILE
+sed -i '/export LOG=/d' $CONFIG_FILE
+sed -i '/export LOCAL_PORT=/d' $CONFIG_FILE
+
 echo "Start-coaster-service..."
 echo "Configuration: $CONFIG_FILE"
 source $CONFIG_FILE
@@ -189,6 +197,14 @@
 export EXECUTIONURL="http://$IPADDR:$SERVICE_PORT"
 export WORKERURL="http://$IPADDR:$LOCAL_PORT"
 
+echo "export WORKERURL=\"http://$IPADDR:$LOCAL_PORT\"" >> $CONFIG_FILE
+
+echo "export PID_FILE=\"$HOME/.swift/.coaster-service-pids\"" >> $CONFIG_FILE
+
+echo "export LOG=\"start-coaster-service.log\"" >> $CONFIG_FILE
+
+echo "export LOCAL_PORT=\"$LOCAL_PORT\"" >> $CONFIG_FILE
+
 echo Generating sites.xml
 if [ -f "gensites.template" ]; then
    gensites $( cat gensites.template ) -p $CONFIG_FILE > sites.xml