Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Redis ACL AUTH two argument supporting. #167

Merged
merged 6 commits into from
Dec 2, 2024
Merged

Redis ACL AUTH two argument supporting. #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5f61e35
Redis ACL AUTH two argument supporting.
Dec 2, 2024
7af3c86
Redis ACL AUTH two argument supporting.
Dec 2, 2024
8475019
Merge branch 'main' into redis-acl-auth-support
LKaemmerling Dec 2, 2024
b7aa908
Merge branch 'main' into redis-acl-auth-support
LKaemmerling Dec 2, 2024
66cdb30
Fix not using empty in Redis Adapter
LKaemmerling Dec 2, 2024
27e01b5
Fix not using empty in RedisNg Adapter
LKaemmerling Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions src/Prometheus/Storage/Redis.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ class Redis implements Adapter
'read_timeout' => '10',
'persistent_connections' => false,
'password' => null,
'user' => null,
];

/**
Expand Down Expand Up @@ -195,9 +196,18 @@ private function ensureOpenConnection(): void
}

$this->connectToServer();
$authParams = [];

if ($this->options['password'] !== null) {
$this->redis->auth($this->options['password']);
if (isset($this->options['user'])) {
$authParams[] = $this->options['user'];
}

if (isset($this->options['password'])) {
$authParams[] = $this->options['password'];
}

if ($authParams !== []) {
$this->redis->auth($authParams);
}

if (isset($this->options['database'])) {
Expand Down
14 changes: 12 additions & 2 deletions src/Prometheus/Storage/RedisNg.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ class RedisNg implements Adapter
'read_timeout' => '10',
'persistent_connections' => false,
'password' => null,
'user' => null,
];

/**
Expand Down Expand Up @@ -195,9 +196,18 @@ private function ensureOpenConnection(): void
}

$this->connectToServer();
$authParams = [];

if ($this->options['password'] !== null) {
$this->redis->auth($this->options['password']);
if (isset($this->options['user'])) {
$authParams[] = $this->options['user'];
}

if (isset($this->options['password'])) {
$authParams[] = $this->options['password'];
}

if ($authParams !== []) {
$this->redis->auth($authParams);
}

if (isset($this->options['database'])) {
Expand Down
Loading