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

[noreply at svn.ci.uchicago.edu]

Author: wozniak
Date: 2011-01-17 15:48:16 -0600 (Mon, 17 Jan 2011)
New Revision: 3985

Modified:
   usertools/persistent-coasters/README.txt
   usertools/persistent-coasters/settings.sh
   usertools/persistent-coasters/setup.sh
   usertools/persistent-coasters/start-service.zsh
Log:
Make the user source settings.sh manually.  Add WORKER_MODE


Modified: usertools/persistent-coasters/README.txt
===================================================================
--- usertools/persistent-coasters/README.txt	2011-01-17 21:41:39 UTC (rev 3984)
+++ usertools/persistent-coasters/README.txt	2011-01-17 21:48:16 UTC (rev 3985)
@@ -1,6 +1,7 @@
 
 Overview of persistent CoasterService process
 
+0) Source settings.sh or a similar file
 1) Start coaster service
 2) Get URL to which Swift should connect from service output
 3) Run Swift once to send settings to CoasterService,

Modified: usertools/persistent-coasters/settings.sh
===================================================================
--- usertools/persistent-coasters/settings.sh	2011-01-17 21:41:39 UTC (rev 3984)
+++ usertools/persistent-coasters/settings.sh	2011-01-17 21:48:16 UTC (rev 3985)
@@ -5,6 +5,9 @@
 
 NODES=64
 
+# How to launch workers- local or ssh
+export WORKER_MODE=local
+
 export WORKER_LOGGING=INFO
   
 # WORKER_HOSTS="login1 login2"

Modified: usertools/persistent-coasters/setup.sh
===================================================================
--- usertools/persistent-coasters/setup.sh	2011-01-17 21:41:39 UTC (rev 3984)
+++ usertools/persistent-coasters/setup.sh	2011-01-17 21:48:16 UTC (rev 3985)
@@ -4,7 +4,6 @@
 # Should extend to generate tc as well
 
 source ${TOOLS}/coasters-setup.sh
-source ./settings.sh
 
 export WORK
 

Modified: usertools/persistent-coasters/start-service.zsh
===================================================================
--- usertools/persistent-coasters/start-service.zsh	2011-01-17 21:41:39 UTC (rev 3984)
+++ usertools/persistent-coasters/start-service.zsh	2011-01-17 21:48:16 UTC (rev 3985)
@@ -28,8 +28,12 @@
 
 local OUT=$1
 
-source workers-local.zsh
-# source workers-ssh.zsh
+if [[ ${WORKER_MODE} == "local" ]] 
+  then 
+  source workers-local.zsh
+elif [[ ${WORKER_MODE} == "ssh" ]] 
+  source workers-ssh.zsh
+fi
 
 # Obtain the URL to which Swift should connect
 get_service_coasters()