Changeset 7946

Timestamp:

08/25/06 22:51:50 (18 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/datacenter/scripts

Files:

• jobmanager (modified) (1 diff)
• scriptlauncher (modified) (3 diffs)
• sourcefile (modified) (2 diffs)

trunk/MagicSoft/Mars/datacenter/scripts/jobmanager

@@ -107 +107 @@
       fi
 
-      date=`date +%Y/%m/%d`
-      date2=`date +%Y-%m-%d`
-      condordir=$logpath/condor/$date
-      makedir $condordir >> $jmscriptlog 2>&1
-      
+      date=`date +%Y-%m-%d`
       echo " committing 1 ${scripts[$i]} to condor" >> $jmscriptlog 2>&1
-      if ! /usr/local/bin/condor_submit -a path=$scriptspath -a prog=${scripts[$i]} -a date=$date2 -a dir=$condordir $scriptspath/run.condor 2>> $jmerrorlog
+      if ! /usr/local/bin/condor_submit -a path=$scriptspath -a prog=${scripts[$i]} -a date=$date -a dir=$runlogpath $scriptspath/run.condor 2>> $jmerrorlog
       then 
          date >> $jmerrorlog

trunk/MagicSoft/Mars/datacenter/scripts/scriptlauncher

@@ -40 +40 @@
 
 path=`dirname $0`
-date=`date +%Y/%m/%d`
-date2=`date +%Y-%m-%d`
-condordir=$logpath/condor/$date
-makedir $condordir >> $scriptlog 2>&1
+date=`date +%Y-%m-%d`
 
 for i in $@
@@ -52 +49 @@
    fi
    echo " launching $i..." >> $scriptlog 2>&1
-   if ! pid=`/usr/local/bin/condor_submit -a path=$path -a prog=$i -a date=$date2 -a dir=$condordir $path/run.condor | grep cluster | cut -dr -f2`  2>$errorlog
+   if ! pid=`/usr/local/bin/condor_submit -a path=$path -a prog=$i -a date=$date -a dir=$runlogpath $path/run.condor | grep cluster | cut -dr -f2`  2>$errorlog
    then 
       echo "condor is not working " >> $errorlog 2>&1
@@ -60 +57 @@
    then
       echo "  waiting for $i to be done..." >> $scriptlog 2>&1
-      /usr/local/bin/condor_wait $condordir/condor-$date2.log $pid >/dev/null 2>$errorlog
+      /usr/local/bin/condor_wait $runlogpath/condor-$date.log $pid >/dev/null 2>$errorlog
    fi
 done

trunk/MagicSoft/Mars/datacenter/scripts/sourcefile

@@ -40 +40 @@
 
 runlogpath=$logpath/run/`date +%Y/%m/%d`
-processlog=$logpath/processlog/process`date +%F`.log
+processlogpath=$logpath/process/
 
 datetime=`date +%F-%H-%M-%S`
@@ -127 +127 @@
 makedir $runlogpath
 makedir $processlogpath
-
+processlog=$logpath/processlog/process`date +%F`.log
 
 function printprocesslog