[Swift-commit] r5796 - trunk/bin/grid

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2012-05-25 04:56:26 -0500 (Fri, 25 May 2012)
New Revision: 5796

Modified:
   trunk/bin/grid/run-gwms-workers
Log:
Make sure important environment variables get used when starting worker.pl


Modified: trunk/bin/grid/run-gwms-workers
===================================================================
--- trunk/bin/grid/run-gwms-workers	2012-05-23 14:53:20 UTC (rev 5795)
+++ trunk/bin/grid/run-gwms-workers	2012-05-25 09:56:26 UTC (rev 5796)
@@ -11,6 +11,10 @@
 x509userproxy=$( voms-proxy-info 2>&1 | grep path | awk '{print $NF}' )
 wallTimeMinutes=60
 n=$2
+if [ -z "$WORKER_LOGGING_LEVEL" ];  then
+   WORKER_LOGGING_LEVEL=INFO
+fi
+echo WORKER_INIT_CMD in run-gwms-workers: $WORKER_INIT_CMD
 
 [ "$#" -eq 2 ] || die "2 arguments required, $# provided"
 
@@ -32,7 +36,7 @@
 
 executable = $workerWrapper
 arguments = $workerContact scec /tmp
-environment = WORKER_LOGGING_LEVEL=DEBUG
+environment = "WORKER_LOGGING_LEVEL='$WORKER_LOGGING_LEVEL' WORKER_INIT_CMD='$WORKER_INIT_CMD'"
 Input   = $workerExecutable
 Error   = condor/job.\$(Cluster).\$(Process).err
 Output  = condor/job.\$(Cluster).\$(Process).out