Changeset 7917 for trunk/MagicSoft/Mars

Timestamp:

08/22/06 20:03:34 (18 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• datacenter/scripts/sourcefile (modified) (7 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -46 +46 @@
      - implemented functions to get todolist via shell
      - improved logging
+     - replaced setstatus, implemented new function not calling root
+       but directly using shell and mysql to speed up the setting of 
+       the status
 
    * datacenter/scripts/jobmanager: 

trunk/MagicSoft/Mars/datacenter/scripts/sourcefile

@@ -121 +121 @@
       continue
    else
-      exit
+      finish
    fi
 }
@@ -199 +199 @@
 }
 
-# function calling the macro to set the status, after a process has finished
-function setstatus()
-{
-   # set status values
-   resetstatusvalues
+# function evaluating the statusvalues
+function evalstatus()
+{
    case $@ in 
       start)   echo "setstatus start"
@@ -233 +231 @@
                ;;
    esac
+}
+
+# function calling the macro to set the status, after a process has finished
+function setstatusroot()
+{
+   # set status values
+   resetstatusvalues
+   evalstatus $@
 
 #   printstatusvalues
@@ -260 +266 @@
 function getstepinfo()
 {
-   if [ "$singleprocess" = "yes" ]
-   then 
-      column=${scriptscolname[$i]}
-   fi
    table=`grep "$column:" $steps | sed -e "s/[.]$column://" -e 's/#//' -e 's/ //g'`
    coltab=`grep "$column:" $steps | sed -e 's/://' -e 's/#//' -e 's/ //g'`
@@ -275 +277 @@
 }
 
+# function to get todolist
 function gettodo()
 {
    echo "getting todo..."
    getdbsetup 
+   if [ "$singleprocess" = "yes" ]
+   then 
+      column=${scriptscolname[$i]}
+   fi
    getstepinfo
    # get query
@@ -304 +311 @@
    fi
 #   echo " QUERY: "$query
-   process=`mysql -s -u $us --password=$pw --host=hercules $db -e " $query "`
+   if ! process=`mysql -s -u $us --password=$pw --host=hercules $db -e " $query "`
+   then
+      echo "ERROR could not query process from db -> contex"
+      contex
+   fi
 
    if [ "$process" = "" ]
@@ -329 +340 @@
    fi
 }
+
+# function to set status of a process in the db
+function setstatus()
+{
+   resetstatusvalues
+   evalstatus $@
+
+   echo "setting todo..."
+   getdbsetup 
+   getstepinfo
+   # get query
+   reset=`grep "$coltab[.]Reset:" $steps | sed -e "s/$coltab[.]Reset://" -e 's/ //g'`
+   echo -$reset-
+   if [ "$reset" = "no" ]
+   then
+      echo "YOU CAN'T RESET $column for $var2!!!" 
+      finish
+   fi
+   query=" update $table set $column=$statustime"
+   if ! echo $influences | grep '#' > /dev/null 
+   then 
+      for influence in $influences
+      do 
+         query=$query", $influence=NULL"
+      done
+   fi
+   query=$query", fStartTime=$starttime, fFailedTime=$failedtime, fFailedCode=$failedcode, fFailedCodeAdd=$failedcodeadd, fReturnCode=$returncode "
+   query=$query" where $primary=$var2"
+   echo " QUERY: "$query
+   if ! mysql -s -u $us --password=$pw --host=hercules $db -e " $query "
+   then 
+      echo "ERROR could not insert status into db -> exit"
+      finish
+   fi
+
+}