You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ay...@apache.org on 2014/10/29 23:03:23 UTC
git commit: less info logs in transports/websocket
Repository: cxf
Updated Branches:
refs/heads/master 73ad9a853 -> 4e9b960f4
less info logs in transports/websocket
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4e9b960f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4e9b960f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4e9b960f
Branch: refs/heads/master
Commit: 4e9b960f4eab531e6086fbe9f3373bf69efca7cd
Parents: 73ad9a8
Author: Akitoshi Yoshida <ay...@apache.org>
Authored: Wed Oct 29 23:02:59 2014 +0100
Committer: Akitoshi Yoshida <ay...@apache.org>
Committed: Wed Oct 29 23:03:12 2014 +0100
----------------------------------------------------------------------
.../websocket/WebSocketVirtualServletRequest.java | 14 ++++++++++----
.../transport/websocket/ahc/AhcWebSocketConduit.java | 14 +++++++-------
.../atmosphere/AtmosphereWebSocketHandler.java | 4 ++--
.../cxf/transport/websocket/jetty/JettyWebSocket.java | 8 ++++----
4 files changed, 23 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/4e9b960f/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/WebSocketVirtualServletRequest.java
----------------------------------------------------------------------
diff --git a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/WebSocketVirtualServletRequest.java b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/WebSocketVirtualServletRequest.java
index aab03cd..9109aed 100644
--- a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/WebSocketVirtualServletRequest.java
+++ b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/WebSocketVirtualServletRequest.java
@@ -333,7 +333,9 @@ public class WebSocketVirtualServletRequest implements HttpServletRequest {
@Override
public String getContextPath() {
- LOG.log(Level.FINE, "getContextPath -> " + webSocketHolder.getContextPath());
+ if (LOG.isLoggable(Level.FINE)) {
+ LOG.log(Level.FINE, "getContextPath -> " + webSocketHolder.getContextPath());
+ }
return webSocketHolder.getContextPath();
}
@@ -396,8 +398,10 @@ public class WebSocketVirtualServletRequest implements HttpServletRequest {
@Override
public String getPathInfo() {
String uri = requestHeaders.get(WebSocketUtils.URI_KEY);
- String servletpath = webSocketHolder.getServletPath();
- LOG.log(Level.FINE, "getPathInfo " + servletpath + " " + uri);
+ String servletpath = webSocketHolder.getServletPath();
+ if (LOG.isLoggable(Level.FINE)) {
+ LOG.log(Level.FINE, "getPathInfo " + servletpath + " " + uri);
+ }
//TODO remove the query string part
//REVISIT may cache this value in requstHeaders?
return uri.substring(servletpath.length());
@@ -432,7 +436,9 @@ public class WebSocketVirtualServletRequest implements HttpServletRequest {
@Override
public String getRequestURI() {
- LOG.log(Level.FINE, "getRequestURI " + requestHeaders.get(WebSocketUtils.URI_KEY));
+ if (LOG.isLoggable(Level.FINE)) {
+ LOG.log(Level.FINE, "getRequestURI " + requestHeaders.get(WebSocketUtils.URI_KEY));
+ }
return requestHeaders.get(WebSocketUtils.URI_KEY);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/4e9b960f/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduit.java
----------------------------------------------------------------------
diff --git a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduit.java b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduit.java
index c243d9d..68d6407 100644
--- a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduit.java
+++ b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduit.java
@@ -267,18 +267,18 @@ public class AhcWebSocketConduit extends URLConnectionHTTPConduit {
//
protected void connect() {
- LOG.log(Level.INFO, "connecting");
+ LOG.log(Level.FINE, "connecting");
if (websocket == null) {
try {
websocket = ahcclient.prepareGet(url.toASCIIString()).execute(
new WebSocketUpgradeHandler.Builder()
.addWebSocketListener(new AhcWebSocketListener()).build()).get();
- LOG.log(Level.INFO, "connected");
+ LOG.log(Level.FINE, "connected");
} catch (Exception e) {
LOG.log(Level.SEVERE, "unable to connect", e);
}
} else {
- LOG.log(Level.INFO, "already connected");
+ LOG.log(Level.FINE, "already connected");
}
}
@@ -309,14 +309,14 @@ public class AhcWebSocketConduit extends URLConnectionHTTPConduit {
protected class AhcWebSocketListener implements WebSocketTextListener, WebSocketByteListener {
public void onOpen(WebSocket ws) {
- if (LOG.isLoggable(Level.INFO)) {
- LOG.log(Level.INFO, "onOpen({0})", ws);
+ if (LOG.isLoggable(Level.FINE)) {
+ LOG.log(Level.FINE, "onOpen({0})", ws);
}
}
public void onClose(WebSocket ws) {
- if (LOG.isLoggable(Level.INFO)) {
- LOG.log(Level.INFO, "onCose({0})", ws);
+ if (LOG.isLoggable(Level.FINE)) {
+ LOG.log(Level.FINE, "onCose({0})", ws);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/4e9b960f/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketHandler.java
----------------------------------------------------------------------
diff --git a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketHandler.java b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketHandler.java
index 791fa66..776741e 100644
--- a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketHandler.java
+++ b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketHandler.java
@@ -148,13 +148,13 @@ public class AtmosphereWebSocketHandler implements WebSocketProtocol {
/** {@inheritDoc}*/
@Override
public void onOpen(WebSocket webSocket) {
- LOG.info("onOpen(WebSocket)");
+ LOG.fine("onOpen(WebSocket)");
}
/** {@inheritDoc}*/
@Override
public void onClose(WebSocket webSocket) {
- LOG.info("onClose(WebSocket)");
+ LOG.fine("onClose(WebSocket)");
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/4e9b960f/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocket.java
----------------------------------------------------------------------
diff --git a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocket.java b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocket.java
index 822f9ed..5bab332 100644
--- a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocket.java
+++ b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocket.java
@@ -66,16 +66,16 @@ class JettyWebSocket implements WebSocket.OnBinaryMessage, WebSocket.OnTextMessa
@Override
public void onClose(int closeCode, String message) {
- if (LOG.isLoggable(Level.INFO)) {
- LOG.log(Level.INFO, "onClose({0}, {1})", new Object[]{closeCode, message});
+ if (LOG.isLoggable(Level.FINE)) {
+ LOG.log(Level.FINE, "onClose({0}, {1})", new Object[]{closeCode, message});
}
this.webSocketConnection = null;
}
@Override
public void onOpen(Connection connection) {
- if (LOG.isLoggable(Level.INFO)) {
- LOG.log(Level.INFO, "onOpen({0}))", connection);
+ if (LOG.isLoggable(Level.FINE)) {
+ LOG.log(Level.FINE, "onOpen({0}))", connection);
}
this.webSocketConnection = connection;
}