Skip to content

Commit 9b5c684

Browse files
nkzawankzawa
authored
Merge pull request socketio#423 from sergey-davydov/donotformateventdata
Add condition to log only if fine level is loggable
2 parents 9d24cd0 + 229a820 commit 9b5c684

File tree

4 files changed

+46
-15
lines changed

4 files changed

+46
-15
lines changed

‎src/main/java/io/socket/client/IO.java‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import okhttp3.OkHttpClient;
77
import okhttp3.WebSocket;
88

9+
import java.util.logging.Level;
910
import javax.net.ssl.HostnameVerifier;
1011
import javax.net.ssl.SSLContext;
1112
import java.net.URI;
@@ -75,11 +76,15 @@ public static Socket socket(URI uri, Options opts) {
7576
Manager io;
7677

7778
if (newConnection) {
78-
logger.fine(String.format("ignoring socket cache for %s", source));
79+
if (logger.isLoggable(Level.FINE)) {
80+
logger.fine(String.format("ignoring socket cache for %s", source));
81+
}
7982
io = new Manager(source, opts);
8083
} else {
8184
if (!managers.containsKey(id)) {
82-
logger.fine(String.format("new io instance for %s", source));
85+
if (logger.isLoggable(Level.FINE)) {
86+
logger.fine(String.format("new io instance for %s", source));
87+
}
8388
managers.putIfAbsent(id, new Manager(source, opts));
8489
}
8590
io = managers.get(id);

‎src/main/java/io/socket/client/Manager.java‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -252,10 +252,14 @@ public Manager open(final OpenCallback fn) {
252252
EventThread.exec(new Runnable() {
253253
@Override
254254
public void run() {
255-
logger.fine(String.format("readyState %s", Manager.this.readyState));
255+
if (logger.isLoggable(Level.FINE)) {
256+
logger.fine(String.format("readyState %s", Manager.this.readyState));
257+
}
256258
if (Manager.this.readyState == ReadyState.OPEN || Manager.this.readyState == ReadyState.OPENING) return;
257259

258-
logger.fine(String.format("opening %s", Manager.this.uri));
260+
if (logger.isLoggable(Level.FINE)) {
261+
logger.fine(String.format("opening %s", Manager.this.uri));
262+
}
259263
Manager.this.engine = new Engine(Manager.this.uri, Manager.this.opts);
260264
final io.socket.engineio.client.Socket socket = Manager.this.engine;
261265
final Manager self = Manager.this;
@@ -460,7 +464,9 @@ public Socket socket(String nsp) {
460464
}
461465

462466
/*package*/ void packet(Packet packet) {
463-
logger.fine(String.format("writing packet %s", packet));
467+
if (logger.isLoggable(Level.FINE)) {
468+
logger.fine(String.format("writing packet %s", packet));
469+
}
464470
final Manager self = this;
465471

466472
if (packet.query != null && !packet.query.isEmpty() && packet.type == Parser.CONNECT) {

‎src/main/java/io/socket/client/Socket.java‎

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,9 @@ private void onopen() {
283283
}
284284

285285
private void onclose(String reason) {
286-
logger.fine(String.format("close (%s)", reason));
286+
if (logger.isLoggable(Level.FINE)) {
287+
logger.fine(String.format("close (%s)", reason));
288+
}
287289
this.connected = false;
288290
this.id = null;
289291
this.emit(EVENT_DISCONNECT, reason);
@@ -337,7 +339,9 @@ private void onpacket(Packet<?> packet) {
337339

338340
private void onevent(Packet<JSONArray> packet) {
339341
List<Object> args = new ArrayList<Object>(Arrays.asList(toArray(packet.data)));
340-
logger.fine(String.format("emitting event %s", args));
342+
if (logger.isLoggable(Level.FINE)) {
343+
logger.fine(String.format("emitting event %s", args));
344+
}
341345

342346
if (packet.id >= 0) {
343347
logger.fine("attaching ack callback to event");
@@ -364,7 +368,9 @@ public void call(final Object... args) {
364368
public void run() {
365369
if (sent[0]) return;
366370
sent[0] = true;
367-
logger.fine(String.format("sending ack %s", args.length != 0 ? args : null));
371+
if (logger.isLoggable(Level.FINE)) {
372+
logger.fine(String.format("sending ack %s", args.length != 0 ? args : null));
373+
}
368374

369375
JSONArray jsonArgs = new JSONArray();
370376
for (Object arg : args) {
@@ -385,10 +391,14 @@ public void run() {
385391
private void onack(Packet<JSONArray> packet) {
386392
Ack fn = this.acks.remove(packet.id);
387393
if (fn != null) {
388-
logger.fine(String.format("calling ack %s with %s", packet.id, packet.data));
394+
if (logger.isLoggable(Level.FINE)) {
395+
logger.fine(String.format("calling ack %s with %s", packet.id, packet.data));
396+
}
389397
fn.call(toArray(packet.data));
390398
} else {
391-
logger.fine(String.format("bad ack %s", packet.id));
399+
if (logger.isLoggable(Level.FINE)) {
400+
logger.fine(String.format("bad ack %s", packet.id));
401+
}
392402
}
393403
}
394404

@@ -414,7 +424,9 @@ private void emitBuffered() {
414424
}
415425

416426
private void ondisconnect() {
417-
logger.fine(String.format("server disconnect (%s)", this.nsp));
427+
if (logger.isLoggable(Level.FINE)) {
428+
logger.fine(String.format("server disconnect (%s)", this.nsp));
429+
}
418430
this.destroy();
419431
this.onclose("io server disconnect");
420432
}
@@ -441,7 +453,9 @@ public Socket close() {
441453
@Override
442454
public void run() {
443455
if (Socket.this.connected) {
444-
logger.fine(String.format("performing disconnect (%s)", Socket.this.nsp));
456+
if (logger.isLoggable(Level.FINE)) {
457+
logger.fine(String.format("performing disconnect (%s)", Socket.this.nsp));
458+
}
445459
Socket.this.packet(new Packet(Parser.DISCONNECT));
446460
}
447461

‎src/main/java/io/socket/parser/Parser.java‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,9 @@ public static class Encoder {
7777
public Encoder() {}
7878

7979
public void encode(Packet obj, Callback callback) {
80-
logger.fine(String.format("encoding packet %s", obj));
80+
if (logger.isLoggable(Level.FINE)) {
81+
logger.fine(String.format("encoding packet %s", obj));
82+
}
8183

8284
if (BINARY_EVENT == obj.type || BINARY_ACK == obj.type) {
8385
encodeAsBinary(obj, callback);
@@ -116,7 +118,9 @@ private String encodeAsString(Packet obj) {
116118
str.append(obj.data);
117119
}
118120

119-
logger.fine(String.format("encoded %s as %s", obj, str));
121+
if (logger.isLoggable(Level.FINE)) {
122+
logger.fine(String.format("encoded %s as %s", obj, str));
123+
}
120124
return str.toString();
121125
}
122126

@@ -233,7 +237,9 @@ private static Packet decodeString(String str) {
233237
}
234238
}
235239

236-
logger.fine(String.format("decoded %s as %s", str, p));
240+
if (logger.isLoggable(Level.FINE)) {
241+
logger.fine(String.format("decoded %s as %s", str, p));
242+
}
237243
return p;
238244
}
239245

0 commit comments

Comments
 (0)