Merge branch 'develop'

README.md

@@ -35,6 +35,9 @@ phpunit --bootstrap craft/app/tests/bootstrap.php --configuration craft/plugins/
 
 Changelog
 =================
+###0.4.1###
+ - Added the ability to control the watch interval via the `taskInterval` config setting
+
 ###0.4.0###
  - Added the ability to run and watch for tasks via the command line.
 

TaskManagerPlugin.php

@@ -40,7 +40,7 @@ public function getDescription()
      */
     public function getVersion()
     {
-        return '0.4.0';
+        return '0.4.1';
     }
 
     /**

config.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Craft;
+
+/**
+ * Task Manager.
+ *
+ * @author    Bob Olde Hampsink <[email protected]>
+ * @copyright Copyright (c) 2015, Bob Olde Hampsink
+ * @license   MIT
+ *
+ * @link      http://github.com/boboldehampsink
+ */
+return array(
+
+    // How long should we wait before we forfeit a task as hanging?
+    'taskTimeout' => 0,
+
+    // At what interval should the watcher watch for new tasks? (in seconds)
+    'taskInterval' => 10
+);

consolecommands/TaskManagerCommand.php

@@ -22,24 +22,10 @@ public function actionRun()
     {
         Craft::log(Craft::t('Running new tasks.'));
 
-        // Make sure tasks aren't already running
-        if (!craft()->tasks->isTaskRunning()) {
+        // Start running tasks
+        craft()->tasks->runPendingTasks();
 
-            // Is there a pending task?
-            if (craft()->tasks->getNextPendingTask()) {
-
-                // Start running tasks
-                craft()->tasks->runPendingTasks();
-
-                return 1;
-            } else {
-                Craft::log(Craft::t('No pending tasks found.'));
-            }
-        } else {
-            Craft::log(Craft::t('Tasks are already running.'));
-        }
-
-        return 0;
+        return 1;
     }
 
     /**
@@ -52,26 +38,14 @@ public function actionWatch()
         // Keep on checking for pending tasks
         while (true) {
 
-            // Make sure tasks aren't already running
-            if (!craft()->tasks->isTaskRunning()) {
-
-                // Reset next pending tasks cache
-                $this->resetCraftNextPendingTasksCache();
-
-                // Is there a pending task?
-                if (craft()->tasks->getNextPendingTask()) {
+            // Reset next pending tasks cache
+            $this->resetCraftNextPendingTasksCache();
 
-                    // Start running tasks
-                    craft()->tasks->runPendingTasks();
-                } else {
-                    Craft::log(Craft::t('No pending tasks found.'));
-                }
-            } else {
-                Craft::log(Craft::t('Tasks are already running, skipping iteration.'));
-            }
+            // Start running tasks
+            craft()->tasks->runPendingTasks();
 
             // Sleep a little
-            sleep(10);
+            sleep(craft()->config->get('taskInterval'));
         }
     }