support cluster resources classify

carno-php · Nov 23, 2018 · 84b23cb · 84b23cb
1 parent 0bdbb4c
commit 84b23cb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/Cluster.php b/src/Cluster.php
@@ -8,6 +8,7 @@
 
 namespace Carno\Redis;
 
+use Carno\Cluster\Classify\Scenes;
 use Carno\Cluster\Contracts\Tags;
 use Carno\Cluster\Managed;
 use Carno\Cluster\Resources;
@@ -52,7 +53,7 @@ abstract class Cluster extends Managed
      */
     public function __construct(Resources $resources)
     {
-        $resources->initialize($this->type, $this->server, $this);
+        $resources->initialize(Scenes::RESOURCE, $this->type, $this->server, $this);
     }
 
     /**
@@ -72,7 +73,7 @@ protected function connecting(Endpoint $endpoint) : Pool
         $vid = "{$this->type}:{$this->server}";
 
         $dsn = new DSN(
-            $node->port() === 0
+            $node->port() <= 0
                 ? $node->host()
                 : sprintf('redis://%s:%d', $node->host(), $node->port())
         );

diff --git a/tests/ClusterTest.php b/tests/ClusterTest.php
@@ -8,7 +8,9 @@
 
 namespace Carno\Redis\Tests;
 
-use Carno\Cluster\Discover\Adaptors\DNS;
+use Carno\Cluster\Classify\Scenes;
+use Carno\Cluster\Classify\Selector;
+use Carno\Cluster\Discovery\Adaptors\DNS;
 use Carno\Cluster\Resources;
 use function Carno\Coroutine\async;
 use Carno\Net\Endpoint;
@@ -26,7 +28,8 @@ class ClusterTest extends TestCase
 
     private function cluster()
     {
-        return $this->cluster ?? $this->cluster = new Resources(new DNS);
+        ($s = new Selector)->assigning(Scenes::RESOURCE, new DNS);
+        return $this->cluster ?? $this->cluster = new Resources($s);
     }
 
     private function redis()