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

send AUTH message if sentinel password is set #2154

Merged
merged 7 commits into from
Apr 14, 2020
+6 −0
Merged

send AUTH message if sentinel password is set #2154

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d1dc512
send AUTH message if sentinel password is set
kkolanowski Feb 27, 2020
17a91d2
send AUTH message if sentinel password is set
kkolanowski Feb 27, 2020
fe7e42e
send AUTH message if sentinel password is set
kkolanowski Feb 28, 2020
9856af4
send AUTH message if sentinel password is set
kkolanowski Feb 28, 2020
8d956ae
Update src/main/java/redis/clients/jedis/JedisSentinelPool.java
kkolanow Feb 28, 2020
6776af3
Update src/main/java/redis/clients/jedis/JedisSentinelPool.java
kkolanow Feb 28, 2020
11ee0d9
Merge branch 'master' into sentinelPassword
sazzad16 Apr 14, 2020
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
6 changes: 6 additions & 0 deletions src/main/java/redis/clients/jedis/JedisSentinelPool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@ public JedisSentinelPool(String masterName, Set<String> sentinels, String passwo
this(masterName, sentinels, new GenericObjectPoolConfig(), Protocol.DEFAULT_TIMEOUT, password);
}

public JedisSentinelPool(String masterName, Set<String> sentinels, String password, String sentinelPassword) {
this(masterName, sentinels, new GenericObjectPoolConfig(), Protocol.DEFAULT_TIMEOUT, Protocol.DEFAULT_TIMEOUT,
password,Protocol.DEFAULT_DATABASE, null, Protocol.DEFAULT_TIMEOUT, Protocol.DEFAULT_TIMEOUT, sentinelPassword, null);
}

public JedisSentinelPool(String masterName, Set<String> sentinels,
final GenericObjectPoolConfig poolConfig, int timeout, final String password) {
this(masterName, sentinels, poolConfig, timeout, password, Protocol.DEFAULT_DATABASE);
Expand Down Expand Up @@ -325,6 +330,7 @@ public void run() {
running.set(true);

while (running.get()) {

try {
// double check that it is not being shutdown
if (!running.get()) {
Expand Down