h4ckx0r/socket.io-client-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #423 from sergey-davydov/donotformateventdata

Browse Source 
Add condition to log only if fine level is loggable
This commit is contained in:
Naoyuki Kanezawa
2017-07-14 11:25:20 +09:00
committed by GitHub
parent 9d24cd00c7 229a820bf5
commit 9b5c684349
4 changed files with 46 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/io/socket/client/IO.java
View File

@@ -6,6 +6,7 @@ import okhttp3.Call;
import okhttp3.OkHttpClient; import okhttp3.OkHttpClient;
import okhttp3.WebSocket; import okhttp3.WebSocket;
import java.util.logging.Level;
import javax.net.ssl.HostnameVerifier; import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.SSLContext; import javax.net.ssl.SSLContext;
import java.net.URI; import java.net.URI;
@@ -75,11 +76,15 @@ public class IO {
Manager io; Manager io;
if (newConnection) { if (newConnection) {
logger.fine(String.format("ignoring socket cache for %s", source)); if (logger.isLoggable(Level.FINE)) {
logger.fine(String.format("ignoring socket cache for %s", source));
}
io = new Manager(source, opts); io = new Manager(source, opts);
} else { } else {
if (!managers.containsKey(id)) { if (!managers.containsKey(id)) {
logger.fine(String.format("new io instance for %s", source)); if (logger.isLoggable(Level.FINE)) {
logger.fine(String.format("new io instance for %s", source));
}
managers.putIfAbsent(id, new Manager(source, opts)); managers.putIfAbsent(id, new Manager(source, opts));
} }
io = managers.get(id); io = managers.get(id);

12
src/main/java/io/socket/client/Manager.java
View File

@@ -252,10 +252,14 @@ public class Manager extends Emitter {
EventThread.exec(new Runnable() { EventThread.exec(new Runnable() {
@Override @Override
public void run() { public void run() {
logger.fine(String.format("readyState %s", Manager.this.readyState)); if (logger.isLoggable(Level.FINE)) {
logger.fine(String.format("readyState %s", Manager.this.readyState));
}
if (Manager.this.readyState == ReadyState.OPEN || Manager.this.readyState == ReadyState.OPENING) return; if (Manager.this.readyState == ReadyState.OPEN || Manager.this.readyState == ReadyState.OPENING) return;
logger.fine(String.format("opening %s", Manager.this.uri)); if (logger.isLoggable(Level.FINE)) {
logger.fine(String.format("opening %s", Manager.this.uri));
}
Manager.this.engine = new Engine(Manager.this.uri, Manager.this.opts); Manager.this.engine = new Engine(Manager.this.uri, Manager.this.opts);
final io.socket.engineio.client.Socket socket = Manager.this.engine; final io.socket.engineio.client.Socket socket = Manager.this.engine;
final Manager self = Manager.this; final Manager self = Manager.this;
@@ -460,7 +464,9 @@ public class Manager extends Emitter {
} }
/*package*/ void packet(Packet packet) { /*package*/ void packet(Packet packet) {
logger.fine(String.format("writing packet %s", packet)); if (logger.isLoggable(Level.FINE)) {
logger.fine(String.format("writing packet %s", packet));
}
final Manager self = this; final Manager self = this;
if (packet.query != null && !packet.query.isEmpty() && packet.type == Parser.CONNECT) { if (packet.query != null && !packet.query.isEmpty() && packet.type == Parser.CONNECT) {

28
src/main/java/io/socket/client/Socket.java
View File

@@ -283,7 +283,9 @@ public class Socket extends Emitter {
} }
private void onclose(String reason) { private void onclose(String reason) {
logger.fine(String.format("close (%s)", reason)); if (logger.isLoggable(Level.FINE)) {
logger.fine(String.format("close (%s)", reason));
}
this.connected = false; this.connected = false;
this.id = null; this.id = null;
this.emit(EVENT_DISCONNECT, reason); this.emit(EVENT_DISCONNECT, reason);
@@ -337,7 +339,9 @@ public class Socket extends Emitter {
private void onevent(Packet<JSONArray> packet) { private void onevent(Packet<JSONArray> packet) {
List<Object> args = new ArrayList<Object>(Arrays.asList(toArray(packet.data))); List<Object> args = new ArrayList<Object>(Arrays.asList(toArray(packet.data)));
logger.fine(String.format("emitting event %s", args)); if (logger.isLoggable(Level.FINE)) {
logger.fine(String.format("emitting event %s", args));
}
if (packet.id >= 0) { if (packet.id >= 0) {
logger.fine("attaching ack callback to event"); logger.fine("attaching ack callback to event");
@@ -364,7 +368,9 @@ public class Socket extends Emitter {
public void run() { public void run() {
if (sent[0]) return; if (sent[0]) return;
sent[0] = true; sent[0] = true;
logger.fine(String.format("sending ack %s", args.length != 0 ? args : null)); if (logger.isLoggable(Level.FINE)) {
logger.fine(String.format("sending ack %s", args.length != 0 ? args : null));
}
JSONArray jsonArgs = new JSONArray(); JSONArray jsonArgs = new JSONArray();
for (Object arg : args) { for (Object arg : args) {
@@ -385,10 +391,14 @@ public class Socket extends Emitter {
private void onack(Packet<JSONArray> packet) { private void onack(Packet<JSONArray> packet) {
Ack fn = this.acks.remove(packet.id); Ack fn = this.acks.remove(packet.id);
if (fn != null) { if (fn != null) {
logger.fine(String.format("calling ack %s with %s", packet.id, packet.data)); if (logger.isLoggable(Level.FINE)) {
logger.fine(String.format("calling ack %s with %s", packet.id, packet.data));
}
fn.call(toArray(packet.data)); fn.call(toArray(packet.data));
} else { } else {
logger.fine(String.format("bad ack %s", packet.id)); if (logger.isLoggable(Level.FINE)) {
logger.fine(String.format("bad ack %s", packet.id));
}
} }
} }
@@ -414,7 +424,9 @@ public class Socket extends Emitter {
} }
private void ondisconnect() { private void ondisconnect() {
logger.fine(String.format("server disconnect (%s)", this.nsp)); if (logger.isLoggable(Level.FINE)) {
logger.fine(String.format("server disconnect (%s)", this.nsp));
}
this.destroy(); this.destroy();
this.onclose("io server disconnect"); this.onclose("io server disconnect");
} }
@@ -441,7 +453,9 @@ public class Socket extends Emitter {
@Override @Override
public void run() { public void run() {
if (Socket.this.connected) { if (Socket.this.connected) {
logger.fine(String.format("performing disconnect (%s)", Socket.this.nsp)); if (logger.isLoggable(Level.FINE)) {
logger.fine(String.format("performing disconnect (%s)", Socket.this.nsp));
}
Socket.this.packet(new Packet(Parser.DISCONNECT)); Socket.this.packet(new Packet(Parser.DISCONNECT));
} }

12
src/main/java/io/socket/parser/Parser.java
View File

@@ -77,7 +77,9 @@ public class Parser {
public Encoder() {} public Encoder() {}
public void encode(Packet obj, Callback callback) { public void encode(Packet obj, Callback callback) {
logger.fine(String.format("encoding packet %s", obj)); if (logger.isLoggable(Level.FINE)) {
logger.fine(String.format("encoding packet %s", obj));
}
if (BINARY_EVENT == obj.type || BINARY_ACK == obj.type) { if (BINARY_EVENT == obj.type || BINARY_ACK == obj.type) {
encodeAsBinary(obj, callback); encodeAsBinary(obj, callback);
@@ -116,7 +118,9 @@ public class Parser {
str.append(obj.data); str.append(obj.data);
} }
logger.fine(String.format("encoded %s as %s", obj, str)); if (logger.isLoggable(Level.FINE)) {
logger.fine(String.format("encoded %s as %s", obj, str));
}
return str.toString(); return str.toString();
} }
@@ -233,7 +237,9 @@ public class Parser {
} }
} }
logger.fine(String.format("decoded %s as %s", str, p)); if (logger.isLoggable(Level.FINE)) {
logger.fine(String.format("decoded %s as %s", str, p));
}
return p; return p;
} }