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.

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

Get enriched Connection information #3745

Merged
merged 5 commits into from
Aug 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
60 changes: 60 additions & 0 deletions src/main/java/redis/clients/jedis/Connection.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import java.io.Closeable;
import java.io.IOException;
import java.net.Socket;
import java.net.SocketAddress;
import java.net.SocketException;
import java.nio.ByteBuffer;
import java.nio.CharBuffer;
Expand Down Expand Up @@ -37,6 +38,8 @@ public class Connection implements Closeable {
private int soTimeout = 0;
private int infiniteSoTimeout = 0;
private boolean broken = false;
private boolean strValActive;
private String strVal;

public Connection() {
this(Protocol.DEFAULT_HOST, Protocol.DEFAULT_PORT);
Expand Down Expand Up @@ -72,6 +75,63 @@ public String toString() {
return "Connection{" + socketFactory + "}";
}

public String toIdentityString() {
jjz921024 marked this conversation as resolved.
Show resolved Hide resolved
if (strValActive == broken && strVal != null) {
return strVal;
}

int id = hashCode();
String classInfo = getClass().toString();

if (socket == null) {
StringBuilder buf = new StringBuilder(56)
.append("[")
.append(classInfo)
.append(", id: 0x")
.append(id)
.append(']');
return buf.toString();
}

SocketAddress remoteAddr = socket.getRemoteSocketAddress();
SocketAddress localAddr = socket.getLocalSocketAddress();
if (remoteAddr != null) {
StringBuilder buf = new StringBuilder(101)
.append("[")
.append(classInfo)
.append(", id: 0x")
.append(id)
.append(", L:")
.append(localAddr)
.append(broken? " ! " : " - ")
.append("R:")
.append(remoteAddr)
.append(']');
strVal = buf.toString();
} else if (localAddr != null) {
StringBuilder buf = new StringBuilder(64)
.append("[")
.append(classInfo)
.append(", id: 0x")
.append(id)
.append(", L:")
.append(localAddr)
.append(']');
strVal = buf.toString();
} else {
StringBuilder buf = new StringBuilder(56)
.append("[")
.append(classInfo)
.append(", id: 0x")
.append(id)
.append(']');
strVal = buf.toString();
}

strValActive = broken;
return strVal;
jjz921024 marked this conversation as resolved.
Show resolved Hide resolved
}

public final RedisProtocol getRedisProtocol() {
return protocol;
}
Expand Down
11 changes: 11 additions & 0 deletions src/test/java/redis/clients/jedis/ConnectionTest.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package redis.clients.jedis;

import org.junit.After;
import org.junit.Assert;
import org.junit.Test;

import redis.clients.jedis.exceptions.JedisConnectionException;
Expand Down Expand Up @@ -40,4 +41,14 @@ public void checkCloseable() {
client.connect();
client.close();
}

@Test
public void checkIdentityString() {
client = new Connection("localhost", 6379);
Assert.assertFalse(client.toIdentityString().contains("6379"));
client.connect();
Assert.assertTrue(client.toIdentityString().contains("6379"));
client.close();
Assert.assertTrue(client.toIdentityString().contains("6379"));
}
}
Loading