[Swift-commit] r7456 - trunk/bin

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2014-01-02 12:04:05 -0600 (Thu, 02 Jan 2014)
New Revision: 7456

Modified:
   trunk/bin/swiftrun
Log:
Adjust for case sensitivity in xml keys


Modified: trunk/bin/swiftrun
===================================================================
--- trunk/bin/swiftrun	2013-12-31 12:17:27 UTC (rev 7455)
+++ trunk/bin/swiftrun	2014-01-02 18:04:05 UTC (rev 7456)
@@ -28,29 +28,29 @@
 
 # List of xml shortcuts
 my %site_aliases = (
-                   'allocationstepsize'        => 'globus.allocationstepsize',
-                   'delaybase'                 => 'karajan.delaybase',
+                   'allocationstepsize'        => 'globus.allocationStepSize',
+                   'delaybase'                 => 'karajan.delayBase',
                    'filesystem'                => 'filesystem',
-                   'highoverallocation'        => 'globus.highoverallocation',
-                   'initialscore'              => 'karajan.initialscore',
+                   'highoverallocation'        => 'globus.highOverallocation',
+                   'initialscore'              => 'karajan.initialScore',
                    'internalhostname'          => 'globus.internalhostname',
-                   'jobgranularity'            => 'globus.nodegranularity',
+                   'jobgranularity'            => 'globus.nodeGranularity',
                    'jobmanager'                => 'jobmanager',
 		   'jobproject'                => 'globus.project',
                    'jobqueue'                  => 'globus.queue',
-                   'jobtype'                   => 'globus.jobtype',
+                   'jobtype'                   => 'globus.jobType',
 		   'jobwalltime'               => 'globus.maxtime',
                    'jobwalltimereserve'        => 'globus.reserve',
-                   'lowoverallocation'         => 'globus.lowoverallocation',
+                   'lowoverallocation'         => 'globus.lowOverallocation',
 		   'maxjobs'                   => 'globus.slots',
-                   'maxnodesperjob'            => 'globus.maxnodes',
-                   'maxsubmitrate'             => 'karajan.maxsubmitrate',
-                   'overallocationdecayfactor' => 'globus.overallocationdecayfactor',
-                   'remotemonitorenabled'      => 'globus.remotemonitorenabled',
+                   'maxnodesperjob'            => 'globus.maxNodes',
+                   'maxsubmitrate'             => 'karajan.maxSubmitRate',
+                   'overallocationdecayfactor' => 'globus.overallocationDecayFactor',
+                   'remotemonitorenabled'      => 'globus.remoteMonitorEnabled',
                    'slurm'                     => 'globus.slurm',
                    'taskdir'                   => 'globus.scratch',
-                   'tasksperworker'            => 'globus.jobspernode',
-                   'taskthrottle'              => 'karajan.jobthrottle',
+                   'tasksperworker'            => 'globus.jobsPerNode',
+                   'taskthrottle'              => 'karajan.jobThrottle',
                    'taskwalltime'              => 'globus.maxwalltime',
                    'workdir'                   => 'workdir',
 		   'workerloglevel'            => 'globus.workerlogginglevel',
@@ -450,6 +450,7 @@
 push(@new_swift_args, "-Drestart.log.name=$run_directory/restart.log");
 push(@new_swift_args, "-swiftoutlog=$run_directory/swift.out");
 push(@new_swift_args, "-runid " . basename($run_directory));
+push( @new_swift_args, sprintf( "-logfile $run_directory/run%03s.log", $run_number ));
 
 # Write swift configuration files
 &write_sites("sites.xml") if defined( $option_siteslist ) || defined($properties{site});
@@ -469,7 +470,6 @@
    else { push( @new_swift_args, $option ); }
 }
 
-push( @new_swift_args, sprintf( "-logfile $run_directory/run%03s.log", $run_number ));
 
 foreach my $arg( @new_swift_args ) {
    print "$arg ";