Skip to content

Commit

Permalink
Issue #5193 - Updating logging per review
Browse files Browse the repository at this point in the history 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
  • Loading branch information
@joakime
joakime committed Aug 28, 2020
1 parent 1690e9d commit 46402bc
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 23 deletions.
12 changes: 6 additions & 6 deletions ...on/src/main/java/org/eclipse/jetty/websocket/common/events/JettyAnnotatedEventDriver.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,8 @@ public void onBinaryFrame(ByteBuffer buffer, boolean fin) throws IOException
{
if (LOG.isDebugEnabled())
{
LOG.debug("onBinaryFrame({}, {}) - events.onBinary={}", BufferUtil.toDetailString(buffer), fin, events.onBinary);
LOG.debug("onBinaryFrame({}, {}) - events.onBinary={}, activeMessage={}",
BufferUtil.toDetailString(buffer), fin, events.onBinary, activeMessage);
}

if (events.onBinary == null)
Expand Down Expand Up @@ -254,7 +255,8 @@ public void onTextFrame(ByteBuffer buffer, boolean fin) throws IOException
{
if (LOG.isDebugEnabled())
{
LOG.debug("onTextFrame({}, {}) - events.onText={}", BufferUtil.toDetailString(buffer), fin, events.onText);
LOG.debug("onTextFrame({}, {}) - events.onText={}, activeMessage={}",
BufferUtil.toDetailString(buffer), fin, events.onText, activeMessage);
}

if (events.onText == null)
Expand Down Expand Up @@ -303,10 +305,8 @@ public void onTextMessage(String message)
{
if (LOG.isDebugEnabled())
{
if (message == null)
LOG.debug("onTextMessage(<null>) - events.onText={}", events.onText);
else
LOG.debug("onTextMessage([{}] \"{}\") - events.onText={}", message.length(), TextUtil.maxStringLength(60, message), events.onText);
LOG.debug("onTextMessage([{}] \"{}\") - events.onText={}",
message.length(), TextUtil.maxStringLength(60, message), events.onText);
}

if (events.onText != null)
Expand Down
34 changes: 17 additions & 17 deletions ...mon/src/main/java/org/eclipse/jetty/websocket/common/events/JettyListenerEventDriver.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,12 @@ public void onBinaryFrame(ByteBuffer buffer, boolean fin) throws IOException
{
if (LOG.isDebugEnabled())
{
LOG.debug("onBinaryFrame({}, {}) - webSocketListener:{}, webSocketPartialListener:{}, listener:{}",
LOG.debug("onBinaryFrame({}, {}) - webSocketListener={}, webSocketPartialListener={}, listener={}, activeMessage={}",
BufferUtil.toDetailString(buffer), fin,
(listener instanceof WebSocketListener),
(listener instanceof WebSocketPartialListener),
listener.getClass().getName());
listener.getClass().getName(),
activeMessage);
}

if (listener instanceof WebSocketListener)
Expand Down Expand Up @@ -116,7 +117,7 @@ public void onBinaryMessage(byte[] data)
{
if (LOG.isDebugEnabled())
{
LOG.debug("onBinaryMessage([{}]) - webSocketListener:{}, listener:{}",
LOG.debug("onBinaryMessage([{}]) - webSocketListener={}, listener={}",
data.length,
(listener instanceof WebSocketListener),
this.listener.getClass().getName());
Expand All @@ -143,7 +144,7 @@ public void onClose(CloseInfo close)

if (LOG.isDebugEnabled())
{
LOG.debug("onClose({},{}) - listener:{}", statusCode, reason, this.listener.getClass().getName());
LOG.debug("onClose({},{}) - listener={}", statusCode, reason, this.listener.getClass().getName());
}
listener.onWebSocketClose(statusCode, reason);
}
Expand All @@ -153,7 +154,7 @@ public void onConnect()
{
if (LOG.isDebugEnabled())
{
LOG.debug("onConnect({}) - listener:{}", session, this.listener.getClass().getName());
LOG.debug("onConnect({}) - listener={}", session, this.listener.getClass().getName());
}
listener.onWebSocketConnect(session);
}
Expand All @@ -163,7 +164,7 @@ public void onError(Throwable cause)
{
if (LOG.isDebugEnabled())
{
LOG.debug("onError({}) - listener:{}", cause.getClass().getName(), this.listener.getClass().getName());
LOG.debug("onError({}) - listener={}", cause.getClass().getName(), this.listener.getClass().getName());
}
listener.onWebSocketError(cause);
}
Expand All @@ -173,7 +174,7 @@ public void onFrame(Frame frame)
{
if (LOG.isDebugEnabled())
{
LOG.debug("onFrame({}) - frameListener:{}, pingPongListener:{}, listener:{}",
LOG.debug("onFrame({}) - frameListener={}, pingPongListener={}, listener={}",
frame,
(listener instanceof WebSocketFrameListener),
(listener instanceof WebSocketPingPongListener),
Expand Down Expand Up @@ -215,12 +216,13 @@ public void onTextFrame(ByteBuffer buffer, boolean fin) throws IOException
{
if (LOG.isDebugEnabled())
{
LOG.debug("onTextFrame({}, {}) - webSocketListener:{}, webSocketPartialListener:{}, listener:{}",
LOG.debug("onTextFrame({}, {}) - webSocketListener={}, webSocketPartialListener={}, listener={}, activeMessage={}",
BufferUtil.toDetailString(buffer),
fin,
(listener instanceof WebSocketListener),
(listener instanceof WebSocketPartialListener),
listener.getClass().getName());
listener.getClass().getName(),
activeMessage);
}

if (listener instanceof WebSocketListener)
Expand Down Expand Up @@ -282,12 +284,9 @@ public void onTextMessage(String message)
{
if (LOG.isDebugEnabled())
{
String msgDetail = message == null
? "<null>"
: String.format("[%d] \"%s\"", message.length(), TextUtil.maxStringLength(60, message));

LOG.debug("onTextMessage({}) - webSocketListener:{} listener:{}",
msgDetail,
LOG.debug("onTextMessage([{}] \"{}\") - webSocketListener={}, listener={}",
message.length(),
TextUtil.maxStringLength(60, message),
(listener instanceof WebSocketListener),
listener.getClass().getName());
}
Expand All @@ -302,11 +301,12 @@ public void onContinuationFrame(ByteBuffer buffer, boolean fin) throws IOExcepti
{
if (LOG.isDebugEnabled())
{
LOG.debug("onContinuationFrame({}, {}) - webSocketListener:{}, webSocketPartialListener:{}, listener:{}",
LOG.debug("onContinuationFrame({}, {}) - webSocketListener={}, webSocketPartialListener={}, listener={}, activeMessage={}",
BufferUtil.toDetailString(buffer), fin,
(listener instanceof WebSocketListener),
(listener instanceof WebSocketPartialListener),
listener.getClass().getName());
listener.getClass().getName(),
activeMessage);
}

if (listener instanceof WebSocketPartialListener)
Expand Down

0 comments on commit 46402bc

Please sign in to comment.