Merge pull request #2 from toplan/v0.4

V0.4

Author: toplan

README.md

@@ -13,7 +13,7 @@ lightweight and powerful task load balancing for php
 # Install
 
 ```php
-    composer require 'toplan/task-balancer:~0.3.0'
+    composer require 'toplan/task-balancer:~0.4.0'
 ```
 
 # Usage
@@ -232,7 +232,7 @@ $task->beforeRun(function($task, $preReturn, $index, $handlers){
 - [x] remember every driver`s start time and end time.
 - [x] smart parse arguments of method `driver()`.
 - [x] task lifecycle and hooks
-- [ ] remove driver and add new driver.
+- [ ] hot remove/add a driver.
 - [ ] pause/resume task
 
 # Dependents

composer.json

@@ -2,7 +2,7 @@
   "name": "toplan/task-balancer",
   "description": "lightweight and powerful task load balancing for php (like the nginx load balancing)",
   "license": "MIT",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "keywords": ["task", "balance", "load balancing", "balancer"],
   "authors": [
     {

src/TaskBalancer/Balancer.php

@@ -97,7 +97,5 @@ public static function getTask($name)
         if (self::hasTask($name)) {
             return self::$tasks[$name];
         }
-
-        return;
     }
 }

src/TaskBalancer/Driver.php

@@ -266,7 +266,5 @@ public function __get($name)
         if (isset($this->$name)) {
             return $this->$name;
         }
-
-        return;
     }
 }

src/TaskBalancer/Task.php

@@ -54,9 +54,9 @@ class Task
     /**
      * task status.
      *
-     * @var string
+     * @var string|null
      */
-    protected $status = '';
+    protected $status = null;
 
     /**
      * current use driver.
@@ -212,15 +212,13 @@ protected function afterRun($success)
      *
      * @param $name
      *
-     * @throws TaskBalancerException
-     *
      * @return bool
      */
     public function runDriver($name)
     {
         $driver = $this->getDriver($name);
         if (!$driver) {
-            throw new TaskBalancerException("Don`t found driver [$name] in task [$this->name], please define it for current task");
+            return false;
         }
         $this->currentDriver = $driver;
         // before run a driver,
@@ -291,14 +289,10 @@ public function getNextBackupDriverName()
         if (($currentKey + 1) < count($drivers)) {
             return $drivers[$currentKey + 1];
         }
-
-        return;
     }
 
     /**
-     * get a driver`s name by drivers` weight.
-     *
-     * @throws TaskBalancerException
+     * get a driver name by driver weight.
      *
      * @return mixed
      */
@@ -318,25 +312,16 @@ public function getDriverNameByWeight()
                 $base = $max;
             }
         }
-        if ($count < 1) {
-            return $this->driverNameRand();
+        if ($count <= 0) {
+            return;
         }
         $number = mt_rand(0, $count - 1);
         foreach ($map as $data) {
             if ($number >= $data['min'] && $number < $data['max']) {
                 return $data['driver'];
             }
         }
-        throw new TaskBalancerException('Get driver name by weight failed, something wrong');
-    }
 
-    /**
-     * get a driver name.
-     *
-     * @return mixed
-     */
-    public function driverNameRand()
-    {
         return array_rand(array_keys($this->drivers));
     }
 
@@ -431,15 +416,13 @@ public function hasDriver($name)
      *
      * @param $name
      *
-     * @return null
+     * @return mixed
      */
     public function getDriver($name)
     {
         if ($this->hasDriver($name)) {
             return $this->drivers[$name];
         }
-
-        return;
     }
 
     /**
@@ -477,7 +460,7 @@ public function isRunning()
      */
     public function reset()
     {
-        $this->status = '';
+        $this->status = null;
         $this->results = null;
 
         return $this;
@@ -604,8 +587,6 @@ public function __get($name)
         if (array_key_exists($name, $this->drivers)) {
             return $this->drivers[$name];
         }
-
-        return;
     }
 
     /**