checkpoint

git-svn-id: https://svn.stsci.edu/svn/ssb/etal/steuermann/trunk@442 d34015c8-bcbb-4646-8ac8-8ba5febf221d

4 files changed, 55 insertions, 49 deletions

diff --git a/scripts/steuermann_report.cgi b/scripts/steuermann_report.cgi
index ba99a8d..2c07c70 100644
--- a/scripts/steuermann_report.cgi
+++ b/scripts/steuermann_report.cgi
@@ -179,6 +179,7 @@ elif action == 'delete' :
             filename = '%s/run/%s'%(steuermann.config.logdir,run)
             print "rm -rf ",filename
         c.execute("DELETE FROM sm_runs WHERE run LIKE ?",(in_run,))
+        c.execute("DELETE FROM sm_status WHERE run LIKE ?",(in_run,))
         db.commit()
         sys.exit(0)
 
diff --git a/steuermann/run.py b/steuermann/run.py
index 63900dd..388b366 100644
--- a/steuermann/run.py
+++ b/steuermann/run.py
@@ -149,7 +149,6 @@ class runner(object):
                     raise
 
             # open the log file, write initial notes
-            print "LOGFILE",logfile_name
             logfile=open(logfile_name,"w")
             logfile.write('%s %s\n'%(datetime.datetime.now(),run))
             logfile.flush()
diff --git a/steuermann/run_all.py b/steuermann/run_all.py
index 71cabd1..4d995cf 100644
--- a/steuermann/run_all.py
+++ b/steuermann/run_all.py
@@ -376,7 +376,7 @@ def run_all(xnodes, run_name, db) :
 
     register_database(db, run_name, xnodes)
 
-    runner = run.runner( xnodes, steuermann.config.logdir )
+    runner = run.runner( xnodes )
 
 
     while 1 :
@@ -440,7 +440,7 @@ def run_step( runner, xnodes, run_name, db ) :
 
                 else :
                     try :
-                        tmp = runner.run(x, run_name, no_run=no_run, logfile = make_log_file_name(run_name, host, table, cmd) ) 
+                        tmp = runner.run(x, run_name, no_run=no_run, logfile_name = make_log_file_name(run_name, host, table, cmd) ) 
                     except run.run_exception, e :
                         now = str(datetime.datetime.now())
                         db.execute("UPDATE sm_status SET start_time=?, end_time=?, status='E', notes=? WHERE ( run=? AND host=? AND tablename=? AND cmd=? )",
diff --git a/x_dist.sm b/x_dist.sm
index dd4bf6c..f58aacd 100644
--- a/x_dist.sm
+++ b/x_dist.sm
@@ -1,104 +1,110 @@
 
+# we can make everything after this
+
+TABLE x_distribute HOST herbert thor arzach bond cadeau
+	CMD gate RUN "exit 0"
+		AFTER init/*
+
 # regular distributions
 
-TABLE distribute HOST herbert thor arzach
+TABLE x_distribute HOST herbert thor arzach
 	CMD x.iraf RUN "synctool - irafx"
-		AFTER stamp/x
+		AFTER x_distribute/gate
 	CMD x.pyssg RUN "synctool - pyssgx"
-		AFTER stamp/x
+		AFTER x_distribute/gate
 	CMD x.stsci_iraf RUN "synctool - stsci_iraf_x"
-		AFTER stamp/x
-	CMD x.hstcal RUN "synctool - hstcal_x"
-		AFTER stamp/x
+		AFTER x_distribute/gate
+	CMD x.hstcal RUN "synctool - hstcalx"
+		AFTER x_distribute/gate
 	CMD x.motd RUN "synctool - irafx/iraf/unix/hlib/motd"
-		AFTER distribute/x.iraf
+		AFTER x_distribute/x.iraf
 
-TABLE distribute HOST bond cadeau
-	CMD irafx.pkg RUN "cd $HOME/daily_build/mac_package; ./clean ; ./build x " AFTER stamp/x
+TABLE x_distribute HOST bond cadeau
+	CMD irafx.pkg RUN "cd $HOME/daily_build/mac_package; ./clean ; ./build x " AFTER x_distribute/gate
 	CMD irafx.dmg RUN "cd $HOME/daily_build/mac_package; ./distribute x -" AFTER irafx.pkg
 
 # wads of special cases
 
 # jwcalibdev has local disk - some day it may do its own builds
-TABLE distribute HOST arzach
-	CMD jwcalibdev.iraf RUN "synctool jwcalibdev: irafx"
-		AFTER stamp/x
-	CMD jwcalibdev.pyssg RUN "synctool jwcalibdev: pyssgx"
-		AFTER stamp/x
-	CMD jwcalibdev.stsci_iraf RUN "synctool jwcalibdev: stsci_iraf_x"
-		AFTER stamp/x
-	CMD jwcalibdev.hstcal RUN "synctool jwcalibdev: hstcalx"
-		AFTER stamp/x
-	CMD jwcalibdev.motd RUN "synctool jwcalibdev: irafx/iraf/unix/hlib/motd"
-		AFTER jwcalibdev.iraf
+TABLE x_distribute HOST arzach
+	CMD x.jwcalibdev.iraf RUN "synctool jwcalibdev: irafx"
+		AFTER x_distribute/gate
+	CMD x.jwcalibdev.pyssg RUN "synctool jwcalibdev: pyssgx"
+		AFTER x_distribute/gate
+	CMD x.jwcalibdev.stsci_iraf RUN "synctool jwcalibdev: stsci_iraf_x"
+		AFTER x_distribute/gate
+	CMD x.jwcalibdev.hstcal RUN "synctool jwcalibdev: hstcalx"
+		AFTER x_distribute/gate
+	CMD x.jwcalibdev.motd RUN "synctool jwcalibdev: irafx/iraf/unix/hlib/motd"
+		AFTER x.jwcalibdev.iraf
 
 # goods - has RHE 5 only now
 
-TABLE distribute_other HOST arzach
+TABLE x_distribute_other HOST arzach
 	CMD goods.iraf RUN "synctool goods12: irafx"
-		AFTER stamp/x
+		AFTER x_distribute/gate
 	CMD goods.pyssg RUN "synctool goods12: pyssgx"
-		AFTER stamp/x
+		AFTER x_distribute/gate
 	CMD goods.stsci_iraf RUN "synctool goods12: stsci_iraf_x"
-		AFTER stamp/x
+		AFTER x_distribute/gate
 	CMD goods.hstcal RUN "synctool goods12: hstcalx"
-		AFTER stamp/x
+		AFTER x_distribute/gate
 	CMD goods.motd RUN "synctool goods12: irafx/iraf/unix/hlib/motd"
 		AFTER goods.iraf
 
 # witserv1 - who are these guys?
 
-TABLE distribute_other HOST arzach
+TABLE x_distribute_other HOST arzach
 	CMD witserv1.iraf RUN "synctool witserv1: irafx"
-		AFTER stamp/x
+		AFTER x_distribute/gate
 	CMD witserv1.pyssg RUN "synctool witserv1: pyssgx"
-		AFTER stamp/x
+		AFTER x_distribute/gate
 	CMD witserv1.stsci_iraf RUN "synctool witserv1: stsci_iraf_x"
-		AFTER stamp/x
+		AFTER x_distribute/gate
 	CMD witserv1.hstcal RUN "synctool witserv1: hstcalx"
-		AFTER stamp/x
+		AFTER x_distribute/gate
 	CMD witserv1.motd RUN "synctool witserv1: irafx/iraf/unix/hlib/motd"
 		AFTER witserv1.iraf
 
 # dmsinsvm - have a pipeline and irafx/irafdev on the same machine for INS
 
-TABLE distribute_other HOST arzach
+TABLE x_distribute_other HOST arzach
 	CMD dmsinsvm.iraf RUN "synctool dmsinsvm: irafx"
-		AFTER stamp/x
+		AFTER x_distribute/gate
 	CMD dmsinsvm.pyssg RUN "synctool dmsinsvm: pyssgx"
-		AFTER stamp/x
+		AFTER x_distribute/gate
 	CMD dmsinsvm.stsci_iraf RUN "synctool dmsinsvm: stsci_iraf_x"
-		AFTER stamp/x
+		AFTER x_distribute/gate
 	CMD dmsinsvm.hstcal RUN "synctool dmsinsvm: hstcalx"
-		AFTER stamp/x
+		AFTER x_distribute/gate
 	CMD dmsinsvm.motd RUN "synctool dmsinsvm: irafx/iraf/unix/hlib/motd"
 		AFTER dmsinsvm.iraf
 
 # UDF - another funded project with their own machines
 
-TABLE distribute_other HOST thor
+TABLE x_distribute_other HOST thor
 	CMD udf1.iraf RUN "synctool udf1: irafx"
-		AFTER stamp/x
+		AFTER x_distribute/gate
 	CMD udf1.pyssg RUN "synctool udf1: pyssgx"
-		AFTER stamp/x
+		AFTER x_distribute/gate
 	CMD udf1.stsci_iraf RUN "synctool udf1: stsci_iraf_x"
-		AFTER stamp/x
-	CMD udf1.hstcal RUN "synctool udf1: hstcal_x"
-		AFTER stamp/x
+		AFTER x_distribute/gate
+	CMD udf1.hstcal RUN "synctool udf1: hstcalx"
+		AFTER x_distribute/gate
 	CMD udf1.motd RUN "synctool udf1: irafx/iraf/unix/hlib/motd"
 		AFTER udf1.iraf
 
 # royal - a beowulf cluster
 
-TABLE distribute_other HOST thor
+TABLE x_distribute_other HOST thor
 	CMD royal.iraf RUN "synctool royal: irafx"
-		AFTER stamp/x
+		AFTER x_distribute/gate
 	CMD royal.pyssg RUN "synctool royal: pyssgx"
-		AFTER stamp/x
+		AFTER x_distribute/gate
 	CMD royal.stsci_iraf RUN "synctool royal: stsci_iraf_x"
-		AFTER stamp/x
+		AFTER x_distribute/gate
 	CMD royal.hstcal RUN "synctool royal: hstcalx"
-		AFTER stamp/x
+		AFTER x_distribute/gate
 	CMD royal.motd RUN "synctool royal: irafx/iraf/unix/hlib/motd"
 		AFTER royal.iraf