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

Add condition to log only if fine level is loggable

Browse Source 
Even if FINE level is not loggable String.format() works every time and
tries to format string with all the events. Sometimes it causes
OutOfMemory exceptions.
This commit is contained in:
Sergey Davydov
2017-05-28 13:01:18 +03:00
parent 8f8c138a61
commit 229a820bf5
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

@@ -3,6 +3,7 @@ package io.socket.client;
import io.socket.parser.Parser; import io.socket.parser.Parser;
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;
@@ -72,11 +73,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

@@ -250,10 +250,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;
@@ -453,7 +457,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 (!self.encoding) { if (!self.encoding) {

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

@@ -273,7 +273,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);
@@ -327,7 +329,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");
@@ -354,7 +358,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) {
@@ -375,10 +381,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));
}
} }
} }
@@ -404,7 +414,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");
} }
@@ -431,7 +443,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;
} }