up

easy-swoole · Jan 21, 2019 · a188466 · a188466
1 parent 3b8ed8a
commit a188466
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/src/Pool/AbstractPool.php b/src/Pool/AbstractPool.php
@@ -10,8 +10,8 @@
 
 
 use EasySwoole\Component\Pool\Exception\PoolEmpty;
-use EasySwoole\Component\Pool\Exception\PoolNumError;
-use EasySwoole\Component\Pool\Exception\PoolUnRegister;
+use EasySwoole\Component\Pool\Exception\PoolObjectNumError;
+use EasySwoole\Component\Pool\Exception\PoolException;
 use EasySwoole\Utility\Random;
 use Swoole\Coroutine\Channel;
 
@@ -31,7 +31,7 @@ public function __construct(PoolConf $conf)
     {
         if($conf->getMinObjectNum() >= $conf->getMaxObjectNum()){
             $class = static::class;
-            throw new PoolNumError("pool max num is small than min num for {$class} error");
+            throw new PoolObjectNumError("pool max num is small than min num for {$class} error");
         }
         $this->conf = $conf;
         $this->poolChannel = new Channel($conf->getMaxObjectNum() + 1);
@@ -198,7 +198,7 @@ public static function invoke(callable $call,float $timeout = null)
                 throw new PoolEmpty(static::class." pool is empty");
             }
         }else{
-            throw new PoolUnRegister(static::class." pool is unregister");
+            throw new PoolException(static::class." convert to pool error");
         }
     }
 

diff --git a/src/Pool/Exception/PoolEmpty.php b/src/Pool/Exception/PoolEmpty.php
@@ -9,7 +9,7 @@
 namespace EasySwoole\Component\Pool\Exception;
 
 
-class PoolEmpty extends \Exception
+class PoolEmpty extends PoolException
 {
 
 }
diff --git a/src/Pool/Exception/PoolUnRegister.php → src/Pool/Exception/PoolException.php b/src/Pool/Exception/PoolUnRegister.php → src/Pool/Exception/PoolException.php
@@ -9,7 +9,7 @@
 namespace EasySwoole\Component\Pool\Exception;
 
 
-class PoolUnRegister extends \Exception
+class PoolException extends \Exception
 {
 
 }
diff --git a/src/Pool/Exception/PoolNumError.php → src/Pool/Exception/PoolObjectNumError.php b/src/Pool/Exception/PoolNumError.php → src/Pool/Exception/PoolObjectNumError.php
@@ -9,7 +9,7 @@
 namespace EasySwoole\Component\Pool\Exception;
 
 
-class PoolNumError extends \Exception
+class PoolObjectNumError extends PoolException
 {
 
 }
diff --git a/src/Pool/PoolConf.php b/src/Pool/PoolConf.php
@@ -9,6 +9,8 @@
 namespace EasySwoole\Component\Pool;
 
 
+use EasySwoole\Component\Pool\Exception\PoolObjectNumError;
+
 class PoolConf
 {
     protected $class;
@@ -83,12 +85,11 @@ public function getMaxObjectNum(): int
         return $this->maxObjectNum;
     }
 
-    /**
-     * @param int $maxObjectNum
-     * @return PoolConf
-     */
     public function setMaxObjectNum(int $maxObjectNum): PoolConf
     {
+        if($this->minObjectNum >= $maxObjectNum){
+            throw new PoolObjectNumError('min num is bigger than max');
+        }
         $this->maxObjectNum = $maxObjectNum;
         return $this;
     }
@@ -137,12 +138,11 @@ public function getMinObjectNum(): int
         return $this->minObjectNum;
     }
 
-    /**
-     * @param int $minObjectNum
-     * @return PoolConf
-     */
     public function setMinObjectNum(int $minObjectNum): PoolConf
     {
+        if($minObjectNum >= $this->maxObjectNum){
+            throw new PoolObjectNumError('min num is bigger than max');
+        }
         $this->minObjectNum = $minObjectNum;
         return $this;
     }

diff --git a/src/Pool/TraitObjectInvoker.php b/src/Pool/TraitObjectInvoker.php
@@ -10,7 +10,7 @@
 
 
 use EasySwoole\Component\Pool\Exception\PoolEmpty;
-use EasySwoole\Component\Pool\Exception\PoolUnRegister;
+use EasySwoole\Component\Pool\Exception\PoolException;
 
 trait TraitObjectInvoker
 {
@@ -32,7 +32,7 @@ public static function invoke(callable $call,float $timeout = null)
                 throw new PoolEmpty(static::class." pool is empty");
             }
         }else{
-            throw new PoolUnRegister(static::class." pool is unregister");
+            throw new PoolException(static::class." convert to pool error");
         }
     }
 }