支持cask迁移

easy-swoole · Mar 9, 2020 · af3b80d · af3b80d
1 parent 5bc5d41
commit af3b80d
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 5 deletions.
diff --git a/src/Exception/Exception.php b/src/Exception/Exception.php
@@ -0,0 +1,10 @@
+<?php
+
+
+namespace EasySwoole\RedisPool\Exception;
+
+
+class Exception extends \Exception
+{
+
+}
diff --git a/src/Redis.php b/src/Redis.php
@@ -5,19 +5,28 @@
 use EasySwoole\Component\Singleton;
 use EasySwoole\Redis\Config\RedisConfig;
 use EasySwoole\Pool\Config as PoolConfig;
+use EasySwoole\Redis\Redis as RedisClient;
+use EasySwoole\Redis\RedisCluster;
+use EasySwoole\RedisPool\Exception\Exception;
 
 class Redis
 {
     use Singleton;
     protected $container = [];
 
-    function register(string $name, RedisConfig $config): PoolConfig
+    function register(string $name, RedisConfig $config,?string $cask = null): PoolConfig
     {
         if(isset($this->container[$name])){
             //已经注册，则抛出异常
             throw new RedisPoolException("redis pool:{$name} is already been register");
         }
-        $pool = new RedisPool($config);
+        if($cask){
+            $ref = new \ReflectionClass($cask);
+            if((!$ref->isSubclassOf(RedisClient::class)) || (!$ref->isSubclassOf(RedisCluster::class))){
+                throw new Exception("cask {$cask} not a sub class of EasySwoole\Redis\Redis or EasySwoole\Redis\RedisCluster");
+            }
+        }
+        $pool = new RedisPool($config,$cask);
         $this->container[$name] = $pool;
         return $pool->getConfig();
     }
@@ -35,7 +44,7 @@ function pool(string $name): ?RedisPool
         return $this->get($name);
     }
 
-    static function defer(string $name,$timeout = null):?\EasySwoole\Redis\Redis
+    static function defer(string $name,$timeout = null):?RedisClient
     {
         $pool = static::getInstance()->pool($name);
         if($pool){

diff --git a/src/RedisPool.php b/src/RedisPool.php
@@ -16,9 +16,12 @@
 
 class RedisPool extends MagicPool
 {
-    function __construct(RedisConfig $redisConfig)
+    function __construct(RedisConfig $redisConfig,?string $cask = null)
     {
-        parent::__construct(function ()use($redisConfig){
+        parent::__construct(function ()use($redisConfig,$cask){
+            if($cask){
+                return new $cask($redisConfig);
+            }
             if ($redisConfig instanceof RedisClusterConfig){
                 $redis = new RedisCluster($redisConfig);
             }else{