Merge pull request #6 from utopia-php/fix-round-robin

Fix round robin index
utopia-php · Nov 8, 2022 · 1137448 · 1137448
2 parents 110e1f1 + af53604
commit 1137448
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/Balancer/Algorithm/RoundRobin.php b/src/Balancer/Algorithm/RoundRobin.php
@@ -37,14 +37,13 @@ public function run(array $options): ?Option
     {
         $this->index++;
 
-        $keys = \array_keys($options);
         $option = null;
 
         if (\count($options) === $this->index) {
-            $option = $options[$keys[0]];
+            $option = $options[0];
             $this->index = 0;
         } else {
-            $option = $options[$keys[$this->index]];
+            $option = $options[$this->index];
         }
 
         return $option;

diff --git a/src/Balancer/Balancer.php b/src/Balancer/Balancer.php
@@ -46,6 +46,8 @@ public function run(): ?Option
             $options = \array_filter($options, $filter);
         }
 
+        $options = \array_values($options);
+
         return $this->algo->run($options);
     }
 }