[Swift-commit] r7344 - trunk/bin

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2013-11-29 01:23:39 -0600 (Fri, 29 Nov 2013)
New Revision: 7344

Modified:
   trunk/bin/prop2scs.pl
   trunk/bin/swift-service
Log:
Add a few more parameters to service definition
Formatting


Modified: trunk/bin/prop2scs.pl
===================================================================
--- trunk/bin/prop2scs.pl	2013-11-29 07:17:48 UTC (rev 7343)
+++ trunk/bin/prop2scs.pl	2013-11-29 07:23:39 UTC (rev 7344)
@@ -15,6 +15,8 @@
 # How to convert SCS options to environment variables
 my %conversionTable = (
                    'ip'          => 'IPADDR',
+                   'jobspernode' => 'JOBSPERNODE',
+                   'jobthrottle' => 'JOBTHROTTLE',
                    'localport'   => 'LOCAL_PORT',
                    'mode'        => 'WORKER_MODE',
                    'serviceport' => 'SERVICE_PORT',

Modified: trunk/bin/swift-service
===================================================================
--- trunk/bin/swift-service	2013-11-29 07:17:48 UTC (rev 7343)
+++ trunk/bin/swift-service	2013-11-29 07:23:39 UTC (rev 7344)
@@ -11,7 +11,7 @@
 
 export WORKER="$SWIFT_BIN/worker.pl"
 export WORKER_LOG="worker"
-export WORKER_LOG_DIR="NOLOGGING"
+export WORKER_LOG_DIR="/tmp"
 export WORKER_LOGGING_LEVEL="NONE"
 export IPADDR="127.0.0.1"
 
@@ -215,7 +215,7 @@
    fi
    source $COASTER_DIR/swift-service.conf 
 
-   echo -e "Starting Swift service..\n"
+   echo -e "Starting Swift service.."
    LOG="$COASTER_DIR/swift-service.log"
 
    # Verify we can find coaster service