Merge branch 'dev' of github.com:toplan/task-balancer into dev

toplan · Apr 14, 2016 · b8b54f1 · b8b54f1
2 parents 0693915 + 6f5741a
commit b8b54f1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -179,7 +179,7 @@ get data value of task instance.
 | beforeCreateDriver | $task, $preReturn, $index, $handlers | no effect |
 | afterCreateDriver | $task, $preReturn, $index, $handlers | no effect |
 | beforeRun | $task, $preReturn, $index, $handlers | if `false` will stop run task and return `false` |
-| beforeDriverRun | $task, $driver, $preReturn, $index, $handlers | if `false` will skip to run current driver and try to use next backup driver |
+| beforeDriverRun | $task, $driver, $preReturn, $index, $handlers | if `false` will stop to use current driver and try to use next backup driver |
 | afterDriverRun | $task, $driverResult, $preReturn, $index, $handlers | no effect |
 | afterRun | $task, $taskResult, $preReturn, $index, $handlers | if not boolean will override result value |
 

diff --git a/src/TaskBalancer/Task.php b/src/TaskBalancer/Task.php
@@ -227,7 +227,7 @@ public function runDriver($name)
         // before run a driver, call 'beforeDriverRun' hooks,
         // but current driver value is already change to this driver.
         // If 'beforeDriverRun' hook return false,
-        // will skip to use current driver and try to use next driver
+        // will stop to use current driver and try to use next driver
         $currentDriverEnable = $this->callHookHandler('beforeDriverRun', $driver);
         if (!$currentDriverEnable) {
             return $this->tryNextDriver();
@@ -273,7 +273,8 @@ public function storeDriverResult($data)
     }
 
     /**
-     * try to use next backup driver
+     * try to use next backup driver.
+     *
      * @return bool
      */
     public function tryNextDriver()