Changeset 27840 for branches/simtest_nebulous_branches/ippTasks/publish.pro

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

• . (modified) (1 prop)
• ippTasks/publish.pro (modified) (7 diffs)

branches/simtest_nebulous_branches/ippTasks/publish.pro

@@ -24 +24 @@
     active true
   end
+  task publish.revert
+    active true
+  end
 end
 
@@ -34 +37 @@
   end
   task publish.run
+    active false
+  end
+  task publish.revert
+    active false
+  end
+end
+
+
+macro publish.revert.on
+  task publish.revert
+    active true
+  end
+end
+
+macro publish.revert.off
+  task publish.revert
     active false
   end
@@ -42 +61 @@
 $publish_trigger_DB = 0
 $publish_load_DB = 0
+$publish_revert_DB = 0
 
 task           publish.trigger
@@ -99 +119 @@
   stderr $LOGDIR/publish.load.log
 
+  # this query should probably be label-based...
   task.exec
     $run = pubtool -pending
@@ -161 +182 @@
     book getword publishRun $pageName stage -var STAGE
     book getword publishRun $pageName stage_id -var STAGE_ID
-    book getword publishRun $pageName exp_id -var EXP_ID
     book getword publishRun $pageName dbname -var DBNAME
 
@@ -170 +190 @@
     strsub $WORKDIR_TEMPLATE @HOST@ $default_host -var WORKDIR
 
-    $run = publish_file.pl --pub_id $PUB_ID --exp_id $EXP_ID --camera $CAMERA --workdir $WORKDIR --product $PRODUCT --stage $STAGE --stage_id $STAGE_ID --redirect-output
+    $run = publish_file.pl --pub_id $PUB_ID --camera $CAMERA --workdir $WORKDIR --product $PRODUCT --stage $STAGE --stage_id $STAGE_ID --redirect-output
     add_standard_args run
 
@@ -201 +221 @@
   end
 end
+
+
+task publish.revert
+  host         local
+
+  periods      -poll 5.0
+  periods      -exec 60.0
+  periods      -timeout 120.0
+  npending     1
+
+  stdout NULL
+  stderr $LOGDIR/revert.log
+
+  task.exec
+    if ($LABEL:n == 0) break
+    $run = pubtool -revert
+    if ($DB:n == 0)
+      option DEFAULT
+    else
+      # save the DB name for the exit tasks
+      option $DB:$publish_revert_DB
+      $run = $run -dbname $DB:$publish_revert_DB
+      $publish_revert_DB ++
+      if ($publish_revert_DB >= $DB:n) set publish_revert_DB = 0
+    end
+    add_poll_labels run
+    command $run
+  end
+
+  # success
+  task.exit    0
+  end
+
+  # locked list
+  task.exit    default
+    showcommand failure
+  end
+
+  task.exit    crash
+    showcommand crash
+  end
+
+  # operation times out?
+  task.exit    timeout
+    showcommand timeout
+  end
+end