Merge branch 'develop'

boboldehampsink · Apr 12, 2016 · 73ee9be · 73ee9be
2 parents e2d0567 + 8566322
commit 73ee9be
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -35,6 +35,9 @@ phpunit --bootstrap craft/app/tests/bootstrap.php --configuration craft/plugins/
 
 Changelog
 =================
+###0.4.2###
+ - Fixed bug with reading default config values
+
 ###0.4.1###
  - Added the ability to control the watch interval via the `taskInterval` config setting
 

diff --git a/TaskManagerPlugin.php b/TaskManagerPlugin.php
@@ -40,7 +40,7 @@ public function getDescription()
      */
     public function getVersion()
     {
-        return '0.4.1';
+        return '0.4.2';
     }
 
     /**

diff --git a/consolecommands/TaskManagerCommand.php b/consolecommands/TaskManagerCommand.php
@@ -45,7 +45,7 @@ public function actionWatch()
             craft()->tasks->runPendingTasks();
 
             // Sleep a little
-            sleep(craft()->config->get('taskInterval'));
+            sleep(craft()->config->get('taskInterval', 'taskManager'));
         }
     }
 

diff --git a/controllers/TaskManagerController.php b/controllers/TaskManagerController.php
@@ -32,7 +32,7 @@ public function actionRerunAllFailedTasks()
             ->where(array('and', 'lft = 1', 'status = :status'), array(':status' => TaskStatus::Error));
 
         // Get all hanging? tasks
-        if ($timeout = craft()->config->get('taskTimeout')) {
+        if ($timeout = craft()->config->get('taskTimeout', 'taskManager')) {
             $query->orWhere(array('and', 'lft = 1', 'dateCreated < (NOW() - INTERVAL :seconds SECOND)'), array(':seconds' => $timeout));
         }