Use vip http port by default when available and add test (#97)

manticoresoftware · Dec 6, 2023 · f62270c · f62270c
1 parent e89c407
commit f62270c
Show file tree

Hide file tree

Showing 4 changed files with 192 additions and 57 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/Lib/ManticoreConfig.php b/src/Lib/ManticoreConfig.php
@@ -96,7 +96,6 @@ protected function parse(string $config): void {
 					$this->$property = $value;
 				}
 			}
-
 			$this->setupEndpoints($endpoints);
 		}
 
@@ -123,8 +122,11 @@ protected function parse(string $config): void {
 	 * @return void
 	 */
 	protected function setupEndpoints(array $endpoints): void {
+		$vipOnly = array_filter($endpoints, fn ($v) => $v['proto'] === '_vip' || $v['proto'] === 'http_vip');
 		$httpOnly = array_filter($endpoints, fn ($v) => $v['proto'] === 'http');
-		if ($httpOnly) {
+		if ($vipOnly) {
+			$endpoint = $vipOnly[array_key_first($vipOnly)];
+		} elseif ($httpOnly) {
 			$endpoint = $httpOnly[array_key_first($httpOnly)];
 		} else {
 			$endpoint = $endpoints[0] ?? null;
@@ -134,7 +136,7 @@ protected function setupEndpoints(array $endpoints): void {
 			return;
 		}
 
-		['proto' => $this->proto, 'host' => $this->host, 'port' => $this->port] = $endpoint;
+		['host' => $this->host, 'port' => $this->port] = $endpoint;
 	}
 
 	/**