Skip to content

Commit 17dc5b4

Browse files
nkzawankzawa
committed
add loggable checks
1 parent bfad012 commit 17dc5b4

File tree

2 files changed

+56
-18
lines changed

2 files changed

+56
-18
lines changed

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

Lines changed: 49 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import java.util.concurrent.Future;
1515
import java.util.concurrent.ScheduledExecutorService;
1616
import java.util.concurrent.TimeUnit;
17+
import java.util.logging.Level;
1718
import java.util.logging.Logger;
1819

1920
import io.socket.emitter.Emitter;
@@ -266,7 +267,9 @@ public void run() {
266267
}
267268

268269
private Transport createTransport(String name) {
269-
logger.fine(String.format("creating transport '%s'", name));
270+
if (logger.isLoggable(Level.FINE)) {
271+
logger.fine(String.format("creating transport '%s'", name));
272+
}
270273
Map<String, String> query = new HashMap<String, String>(this.query);
271274

272275
query.put("EIO", String.valueOf(Parser.PROTOCOL));
@@ -307,11 +310,15 @@ private Transport createTransport(String name) {
307310
}
308311

309312
private void setTransport(Transport transport) {
310-
logger.fine(String.format("setting transport %s", transport.name));
313+
if (logger.isLoggable(Level.FINE)) {
314+
logger.fine(String.format("setting transport %s", transport.name));
315+
}
311316
final Socket self = this;
312317

313318
if (this.transport != null) {
314-
logger.fine(String.format("clearing existing transport %s", this.transport.name));
319+
if (logger.isLoggable(Level.FINE)) {
320+
logger.fine(String.format("clearing existing transport %s", this.transport.name));
321+
}
315322
this.transport.off();
316323
}
317324

@@ -341,7 +348,9 @@ public void call(Object... args) {
341348
}
342349

343350
private void probe(final String name) {
344-
logger.fine(String.format("probing transport '%s'", name));
351+
if (logger.isLoggable(Level.FINE)) {
352+
logger.fine(String.format("probing transport '%s'", name));
353+
}
345354
final Transport[] transport = new Transport[] {this.createTransport(name)};
346355
final boolean[] failed = new boolean[] {false};
347356
final Socket self = this;
@@ -355,7 +364,9 @@ private void probe(final String name) {
355364
public void call(Object... args) {
356365
if (failed[0]) return;
357366

358-
logger.fine(String.format("probe transport '%s' opened", name));
367+
if (logger.isLoggable(Level.FINE)) {
368+
logger.fine(String.format("probe transport '%s' opened", name));
369+
}
359370
Packet<String> packet = new Packet<String>(Packet.PING, "probe");
360371
transport[0].send(new Packet[] {packet});
361372
transport[0].once(Transport.EVENT_PACKET, new Listener() {
@@ -365,13 +376,17 @@ public void call(Object... args) {
365376

366377
Packet msg = (Packet)args[0];
367378
if (Packet.PONG.equals(msg.type) && "probe".equals(msg.data)) {
368-
logger.fine(String.format("probe transport '%s' pong", name));
379+
if (logger.isLoggable(Level.FINE)) {
380+
logger.fine(String.format("probe transport '%s' pong", name));
381+
}
369382
self.upgrading = true;
370383
self.emit(EVENT_UPGRADING, transport[0]);
371384
if (null == transport[0]) return;
372385
Socket.priorWebsocketSuccess = WebSocket.NAME.equals(transport[0].name);
373386

374-
logger.fine(String.format("pausing current transport '%s'", self.transport.name));
387+
if (logger.isLoggable(Level.FINE)) {
388+
logger.fine(String.format("pausing current transport '%s'", self.transport.name));
389+
}
375390
((Polling)self.transport).pause(new Runnable() {
376391
@Override
377392
public void run() {
@@ -392,7 +407,9 @@ public void run() {
392407
}
393408
});
394409
} else {
395-
logger.fine(String.format("probe transport '%s' failed", name));
410+
if (logger.isLoggable(Level.FINE)) {
411+
logger.fine(String.format("probe transport '%s' failed", name));
412+
}
396413
EngineIOException err = new EngineIOException(PROBE_ERROR);
397414
err.transport = transport[0].name;
398415
self.emit(EVENT_UPGRADE_ERROR, err);
@@ -433,7 +450,9 @@ public void call(Object... args) {
433450

434451
freezeTransport.call();
435452

436-
logger.fine(String.format("probe transport \"%s\" failed because of error: %s", name, err));
453+
if (logger.isLoggable(Level.FINE)) {
454+
logger.fine(String.format("probe transport \"%s\" failed because of error: %s", name, err));
455+
}
437456

438457
self.emit(EVENT_UPGRADE_ERROR, error);
439458
}
@@ -460,7 +479,9 @@ public void call(Object... args) {
460479
public void call(Object... args) {
461480
Transport to = (Transport)args[0];
462481
if (transport[0] != null && !to.name.equals(transport[0].name)) {
463-
logger.fine(String.format("'%s' works - aborting '%s'", to.name, transport[0].name));
482+
if (logger.isLoggable(Level.FINE)) {
483+
logger.fine(String.format("'%s' works - aborting '%s'", to.name, transport[0].name));
484+
}
464485
freezeTransport.call();
465486
}
466487
}
@@ -506,7 +527,9 @@ private void onPacket(Packet packet) {
506527
if (this.readyState == ReadyState.OPENING ||
507528
this.readyState == ReadyState.OPEN ||
508529
this.readyState == ReadyState.CLOSING) {
509-
logger.fine(String.format("socket received: type '%s', data '%s'", packet.type, packet.data));
530+
if (logger.isLoggable(Level.FINE)) {
531+
logger.fine(String.format("socket received: type '%s', data '%s'", packet.type, packet.data));
532+
}
510533

511534
this.emit(EVENT_PACKET, packet);
512535
this.emit(EVENT_HEARTBEAT);
@@ -529,7 +552,9 @@ private void onPacket(Packet packet) {
529552
this.emit(EVENT_MESSAGE, packet.data);
530553
}
531554
} else {
532-
logger.fine(String.format("packet received with socket readyState '%s'", this.readyState));
555+
if (logger.isLoggable(Level.FINE)) {
556+
logger.fine(String.format("packet received with socket readyState '%s'", this.readyState));
557+
}
533558
}
534559
}
535560

@@ -585,7 +610,9 @@ public void run() {
585610
EventThread.exec(new Runnable() {
586611
@Override
587612
public void run() {
588-
logger.fine(String.format("writing ping packet - expecting pong within %sms", self.pingTimeout));
613+
if (logger.isLoggable(Level.FINE)) {
614+
logger.fine(String.format("writing ping packet - expecting pong within %sms", self.pingTimeout));
615+
}
589616
self.ping();
590617
self.onHeartbeat(self.pingTimeout);
591618
}
@@ -627,7 +654,9 @@ private void onDrain() {
627654
private void flush() {
628655
if (this.readyState != ReadyState.CLOSED && this.transport.writable &&
629656
!this.upgrading && this.writeBuffer.size() != 0) {
630-
logger.fine(String.format("flushing %d packets in socket", this.writeBuffer.size()));
657+
if (logger.isLoggable(Level.FINE)) {
658+
logger.fine(String.format("flushing %d packets in socket", this.writeBuffer.size()));
659+
}
631660
this.prevBufferLen = this.writeBuffer.size();
632661
this.transport.send(this.writeBuffer.toArray(new Packet[this.writeBuffer.size()]));
633662
this.emit(EVENT_FLUSH);
@@ -784,7 +813,9 @@ public void call(Object... args) {
784813
}
785814

786815
private void onError(Exception err) {
787-
logger.fine(String.format("socket error %s", err));
816+
if (logger.isLoggable(Level.FINE)) {
817+
logger.fine(String.format("socket error %s", err));
818+
}
788819
Socket.priorWebsocketSuccess = false;
789820
this.emit(EVENT_ERROR, err);
790821
this.onClose("transport error", err);
@@ -796,7 +827,9 @@ private void onClose(String reason) {
796827

797828
private void onClose(String reason, Exception desc) {
798829
if (ReadyState.OPENING == this.readyState || ReadyState.OPEN == this.readyState || ReadyState.CLOSING == this.readyState) {
799-
logger.fine(String.format("socket close with reason: %s", reason));
830+
if (logger.isLoggable(Level.FINE)) {
831+
logger.fine(String.format("socket close with reason: %s", reason));
832+
}
800833
final Socket self = this;
801834

802835
// clear timers

‎src/main/java/io/socket/engineio/client/transports/Polling.java‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
import java.util.HashMap;
1414
import java.util.Map;
15+
import java.util.logging.Level;
1516
import java.util.logging.Logger;
1617

1718
abstract public class Polling extends Transport {
@@ -108,7 +109,9 @@ protected void onData(byte[] data) {
108109

109110
private void _onData(Object data) {
110111
final Polling self = this;
111-
logger.fine(String.format("polling got data %s", data));
112+
if (logger.isLoggable(Level.FINE)) {
113+
logger.fine(String.format("polling got data %s", data));
114+
}
112115
Parser.DecodePayloadCallback callback = new Parser.DecodePayloadCallback() {
113116
@Override
114117
public boolean call(Packet packet, int index, int total) {
@@ -141,7 +144,9 @@ public boolean call(Packet packet, int index, int total) {
141144
if (this.readyState == ReadyState.OPEN) {
142145
this.poll();
143146
} else {
144-
logger.fine(String.format("ignoring poll - transport state '%s'", this.readyState));
147+
if (logger.isLoggable(Level.FINE)) {
148+
logger.fine(String.format("ignoring poll - transport state '%s'", this.readyState));
149+
}
145150
}
146151
}
147152
}

0 commit comments

Comments
 (0)