Changeset 21100

Timestamp:

Jan 9, 2009, 10:10:38 AM (17 years ago)

Author:

bills

Message:

pass -label to magictool if LABEL is set

File:

• trunk/ippTasks/magic.pro (modified) (4 diffs)

trunk/ippTasks/magic.pro

@@ -87 +87 @@
 
   task.exec
+    $run = magictool -totree
     if ($DB:n == 0)
       option DEFAULT
-      command magictool -totree -limit 20
     else
       # save the DB name for the exit tasks
       option $DB:$magicToTree_DB
-      command magictool -totree -limit 20 -dbname $DB:$magicToTree_DB
+      $run = $run -dbname $DB:$magicToTree_DB
       $magicToTree_DB ++
       if ($magicToTree_DB >= $DB:n) set magicToTree_DB = 0
     end
+    add_poll_args run
+    command $run
   end
 
@@ -206 +208 @@
 
   task.exec
+    $run = magictool -toprocess
     if ($DB:n == 0)
       option DEFAULT
-      command magictool -toprocess -limit 20
     else
       # save the DB name for the exit tasks
       option $DB:$magicToProcess_DB
-      command magictool -toprocess -limit 20 -dbname $DB:$magicToProcess_DB
+      $run = $run -dbname $DB:$magicToProcess_DB
       $magicToProcess_DB ++
       if ($magicToProcess_DB >= $DB:n) set magicToProcess_DB = 0
     end
+    add_poll_args run
+    command $run
   end
 
@@ -311 +315 @@
 
   periods      -poll $LOADPOLL
-  periods      -exec 60
-  periods      -timeout 30
+  periods      -exec 30
+  periods      -timeout 20
   npending     1
 
@@ -319 +323 @@
 
   task.exec
+    $run = magicdstool -todestreak -limit 32
     if ($DB:n == 0)
       option DEFAULT
-      command magicdstool -todestreak -limit 20
     else
       # save the DB name for the exit tasks
       option $DB:$magicToDS_DB
-      command magicdstool -todestreak -limit 20 -dbname $DB:$magicToDS_DB
+      $run = $run -dbname $DB:$magicToDS_DB
       $magicToDS_DB ++
       if ($magicToDS_DB >= $DB:n) set magicToDS_DB = 0
     end
+#    XXX magicDSRun doesn't have label so can't use add_poll_args
+#    add_poll_args run
+    command $run
   end