Index: trunk/ippTasks/magic.pro
===================================================================
--- trunk/ippTasks/magic.pro	(revision 21009)
+++ trunk/ippTasks/magic.pro	(revision 21100)
@@ -87,14 +87,16 @@
 
   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,14 +208,16 @@
 
   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,6 +315,6 @@
 
   periods      -poll $LOADPOLL
-  periods      -exec 60
-  periods      -timeout 30
+  periods      -exec 30
+  periods      -timeout 20
   npending     1
 
@@ -319,14 +323,17 @@
 
   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