Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 8460)
+++ trunk/MagicSoft/Mars/Changelog	(revision 8461)
@@ -19,4 +19,16 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2007/04/27 Daniela Dorner
+
+   * datacenter/scripts/jobmanager:
+     - improved logging
+
+   * datacenter/scripts/scriptlauncher:
+     - redirect of error messages of condor_submit to errorlogfile
+     - in case condor_submit does not work (i.e. pid empty) an error 
+       message is written to the processlogfile
+
+
+
  2007/04/27
 
Index: trunk/MagicSoft/Mars/datacenter/scripts/jobmanager
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/jobmanager	(revision 8460)
+++ trunk/MagicSoft/Mars/datacenter/scripts/jobmanager	(revision 8461)
@@ -82,7 +82,7 @@
       if echo $q | egrep \(Error\|failed\)
       then 
-         echo "WARN condor_q failed" >> $jmscriptlog 2>&1
+         echo `date`" WARN condor_q failed" >> $jmscriptlog 2>&1
          printprocesslog "WARN condor_q failed"
-         echo `date`"ERROR condor_q failed" >> $jmerrorlog
+         echo `date`" WARN condor_q failed" >> $jmerrorlog
          cont >> $jmscriptlog 2>&1
       fi
@@ -139,5 +139,5 @@
       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 
-         echo `date`"ERROR condor_submit failed" >> $jmerrorlog
+         echo `date`" WARN condor_submit failed" >> $jmerrorlog
          echo "condor is not working -> sleeping $errorsleeptime" >> $jmscriptlog 2>&1
          printprocesslog "WARN submitting ${scripts[$i]} to condor failed"
Index: trunk/MagicSoft/Mars/datacenter/scripts/scriptlauncher
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/scriptlauncher	(revision 8460)
+++ trunk/MagicSoft/Mars/datacenter/scripts/scriptlauncher	(revision 8461)
@@ -49,8 +49,9 @@
    fi
    echo " launching $i..." >> $scriptlog 2>&1
-   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
+   pid=`/usr/local/bin/condor_submit -a path=$path -a prog=$i -a date=$date -a dir=$runlogpath $path/run.condor >> $errorlog | grep 'submitted to cluster' | cut -dr -f2`
+   if [ "$pid" = "" ]
    then 
-      echo "condor is not working " >> $errorlog 2>&1
-      printprocesslog "ERROR submitting $i to condor failed"
+      echo `date`" WARN condor is not working " >> $errorlog 2>&1
+      printprocesslog "WARN submitting $i to condor failed"
    fi
    if ! echo $@ | grep "allatthesametime" >/dev/null 2>$errorlog