Skip to content

Commit 269b8fc

Browse files
committed
Merge branch 'fix-sniffing' of https://github.com/marcvdm/elasticsearch-php into marcvdm-fix-sniffing
2 parents b99c41b + 1de4044 commit 269b8fc

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

src/Elasticsearch/ConnectionPool/SniffingConnectionPool.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ private function sniffConnection(Connection $connection): bool
124124
return true;
125125
}
126126

127-
private function parseClusterState(string $transportSchema, array $nodeInfo): array
127+
private function parseClusterState(string $transportSchema, $nodeInfo): array
128128
{
129129
$pattern = '/([^:]*):([0-9]+)/';
130130
$schemaAddress = $transportSchema . '_address';

src/Elasticsearch/Connections/Connection.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,10 @@ public function ping(): bool
448448
}
449449
}
450450

451-
public function sniff(): array
451+
/**
452+
* @return array|\GuzzleHttp\Ring\Future\FutureArray
453+
*/
454+
public function sniff()
452455
{
453456
$options = [
454457
'client' => [

0 commit comments

Comments
 (0)