Changeset 7907

Timestamp:

08/22/06 09:40:48 (18 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

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

trunk/MagicSoft/Mars/Changelog

@@ -40 +40 @@
    * datacenter/scripts/sourcefile: 
      - included webpath
+     - added comments
+     - added variables and functions for jobmanager
+     - removed changing variables 
+     - added addresses
 
    * datacenter/scripts/jobmanager: 
-     - added
+     - added (script to controll the amount of callisto, star, ganymed
+       and datacheck running)
+
+   * datacenter/scripts/setup: 
+     - added (file to store setup variables, which might be changed)
+
+   * datacenter/scripts/copyscript: 
+     - removed addresses
+     - fixed typo
 
 

trunk/MagicSoft/Mars/datacenter/scripts/copyscript

@@ -212 +212 @@
 catalog=$setuppath/$magfav #current catalogfile
 diff=$setuppath/.diff #file to store difference
-#addresses to which the changes are sent
-adrs="datacenter@astro.uni-wuerzburg.de, tbretz@astro.uni-wuerzburg.de" 
 
 #getting new catalogfiles 
@@ -240 +238 @@
          cat $diff | grep '<'  >> $scriptlog 2>&1 
          echo " -> please check the file $catfile" >> $scriptlog 2>&1 
-         #inform $adr about removed lines
+         #inform $adrs about removed lines
          nail -s 'catalogfile - removed lines' $adrs < $diff
          exit
@@ -262 +260 @@
          exit
       fi
-      #inform $adr about changes
+      #inform $adrs about changes
       echo "file has been rsynced sucessfully -> sending email" >> $scriptlog 2>&1 
       nail -s 'new catalogfile installed - new lines'  $adrs < $diff
@@ -273 +271 @@
       cat $diff | grep '<'  >> $scriptlog 2>&1 
       echo " -> please check the file $catfile" >> $scriptlog 2>&1 
-      #inform $adr about removed lines
+      #inform $adrs about removed lines
       nail -s 'catalogfile - removed lines' $adrs < $diff
       exit

trunk/MagicSoft/Mars/datacenter/scripts/sourcefile

@@ -27 +27 @@
 # This a resource file for the scripts, in which the standard paths and 
 # functions, which are needed more often are stored. 
-#
-
-export ROOTSYS=/opt/root_v4.04.02g
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ROOTSYS/lib
-export PATH=$PATH:$ROOTSYS/bin
+# Only constant variables are stored here, changing variables are stored 
+# in datacenter/scripts/setup
+#
+
+source `dirname $0`/setup
 
 mars=`dirname $0 | sed -e 's/\/datacenter\/scripts//'`
-
 macrospath=$mars/datacenter/macros
 scriptspath=$mars/datacenter/scripts
 
-logpath=/magic/datacenter/autologs
-lockpath=/magic/datacenter/locks
-listpath=/magic/datacenter/lists
-setuppath=/magic/datacenter/setup
-
-datapath=/magic/data
-subsystempath=/magic/subsystemdata
-sequpath=/magic/sequences
-datasetpath=/magic/datasets
-
 webpath=/www/htdocs/datacenter
 
@@ -53 +42 @@
 
 check="ok"
-
 
 #failed codes
@@ -82 +70 @@
 Ffillganymed=21
 
-
-
+# setup for jobmanager
+steps=$mars/steps.rc
+
+pno=0
+pnototal=0
+running=0
+queued=0
+runningscript=0
+queuedscript=0
+
+
+function setzero()
+{
+   val=$@
+   if [ "$val" == "" ]
+   then 
+      test=`condor_q -global`
+      if [ "$test" == "" ]
+      then 
+         echo $max
+      else
+         echo 0
+      fi
+   else
+      echo $val
+   fi
+}
+
+
+
+
+# in the following the function, which are needed by several scripts, are 
+# defined
+
+# function to exit a script properly
 function finish()
 {
@@ -92 +113 @@
 }
 
+# function to make sure that a directory is made
 function makedir()
 {
@@ -105 +127 @@
 }
 
+# function to check if a process is already locked
 function checklock()
 { 
@@ -119 +142 @@
 }
 
+# function calling the macro, which is producing the todo-list
 function getdolist()
 {
@@ -164 +188 @@
 }
 
+# function calling the macro to set the status, after a process has finished
 function setstatus()
 {