Skip to content

Add support for local addr in CLIENT KILL #2478

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

Merged
merged 2 commits into from
Mar 23, 2021
Merged

Add support for local addr in CLIENT KILL #2478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee007f6
Add support for local addr in CLIENT KILL
dengliming Mar 23, 2021
5e4314d
test
dengliming Mar 23, 2021
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
10 changes: 10 additions & 0 deletions src/main/java/redis/clients/jedis/params/ClientKillParams.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ public class ClientKillParams extends Params {
private static final String ADDR = "ADDR";
private static final String SKIPME = "SKIPME";
private static final String USER = "USER";
private static final String LADDR = "LADDR";

public static enum Type {
NORMAL, MASTER, SLAVE, PUBSUB;
Expand Down Expand Up @@ -63,4 +64,13 @@ public ClientKillParams user(String username) {
return this;
}

public ClientKillParams laddr(String ipPort) {
addParam(LADDR, ipPort);
return this;
}

public ClientKillParams laddr(String ip, int port) {
addParam(LADDR, ip + ':' + port);
return this;
}
}
13 changes: 13 additions & 0 deletions src/test/java/redis/clients/jedis/tests/commands/ClientCommandsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,19 @@ public void killAddrBinary() {
assertDisconnected(client);
}

@Test
public void killLAddr() {
String info = findInClientList();
Matcher matcher = Pattern.compile("\\bladdr=(\\S+)\\b").matcher(info);
matcher.find();
String laddr = matcher.group(1);

long clients = jedis.clientKill(new ClientKillParams().laddr(laddr));
assertTrue(clients >= 1);

assertDisconnected(client);
}

@Test
public void killAddrIpPort() {
String info = findInClientList();
Expand Down