WICKET-5364 Reduce logging for wicket-atmosphere
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/cc292d47 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/cc292d47 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/cc292d47 Branch: refs/heads/sandbox/WICKET-4686 Commit: cc292d47267d5e1a85f3b41350c4c22072f3183f Parents: 46d768c Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Tue Dec 17 15:06:39 2013 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Tue Dec 17 15:06:39 2013 +0200 ---------------------------------------------------------------------- .../wicket/atmosphere/AtmosphereBehavior.java | 12 +++---- .../org/apache/wicket/atmosphere/EventBus.java | 36 +++++++++++--------- 2 files changed, 26 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/cc292d47/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereBehavior.java ---------------------------------------------------------------------- diff --git a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereBehavior.java b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereBehavior.java index 486e480..5116cfd 100644 --- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereBehavior.java +++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereBehavior.java @@ -148,13 +148,13 @@ public class AtmosphereBehavior extends Behavior @Override public void onSuspend(AtmosphereResourceEvent event) { - if (log.isInfoEnabled()) + if (log.isDebugEnabled()) { String transport = event.getResource() .getRequest() .getHeader(HeaderConfig.X_ATMOSPHERE_TRANSPORT); HttpServletRequest req = event.getResource().getRequest(); - log.info(String.format("Suspending the %s response from ip %s:%s", transport == null + log.debug(String.format("Suspending the %s response from ip %s:%s", transport == null ? "websocket" : transport, req.getRemoteAddr(), req.getRemotePort())); } } @@ -162,11 +162,11 @@ public class AtmosphereBehavior extends Behavior @Override public void onResume(AtmosphereResourceEvent event) { - if (log.isInfoEnabled()) + if (log.isDebugEnabled()) { String transport = event.getResource().getRequest().getHeader("X-Atmosphere-Transport"); HttpServletRequest req = event.getResource().getRequest(); - log.info(String.format("Resuming the %s response from ip %s:%s", transport == null + log.debug(String.format("Resuming the %s response from ip %s:%s", transport == null ? "websocket" : transport, req.getRemoteAddr(), req.getRemotePort())); } } @@ -174,11 +174,11 @@ public class AtmosphereBehavior extends Behavior @Override public void onDisconnect(AtmosphereResourceEvent event) { - if (log.isInfoEnabled()) + if (log.isDebugEnabled()) { String transport = event.getResource().getRequest().getHeader("X-Atmosphere-Transport"); HttpServletRequest req = event.getResource().getRequest(); - log.info(String.format("%s connection dropped from ip %s:%s", transport == null + log.debug(String.format("%s connection dropped from ip %s:%s", transport == null ? "websocket" : transport, req.getRemoteAddr(), req.getRemotePort())); } // It is possible that the application has already been destroyed, in which case http://git-wip-us.apache.org/repos/asf/wicket/blob/cc292d47/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventBus.java ---------------------------------------------------------------------- diff --git a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventBus.java b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventBus.java index 8bada96..6578494 100644 --- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventBus.java +++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventBus.java @@ -213,8 +213,12 @@ public class EventBus implements UnboundListener } trackedPages.put(trackingId, pageKey); fireRegistration(trackingId, page); - log.info("registered page {} for session {}", - new Object[] { pageKey.getPageId(), pageKey.getSessionId() }); + + if (log.isDebugEnabled()) + { + log.debug("registered page {} for session {}", + pageKey.getPageId(), pageKey.getSessionId()); + } } /** @@ -225,17 +229,17 @@ public class EventBus implements UnboundListener */ public synchronized void register(Page page, EventSubscription subscription) { - if (log.isInfoEnabled()) + if (log.isDebugEnabled()) { - log.info( - "registering {} for page {} for session {}: {}{}", - new Object[] { - subscription.getBehaviorIndex() == null ? "component" : "behavior", - page.getPageId(), - Session.get().getId(), - subscription.getComponentPath(), - subscription.getBehaviorIndex() == null ? "" : ":" + - subscription.getBehaviorIndex() }); + log.debug( + "registering {} for page {} for session {}: {}{}", + new Object[]{ + subscription.getBehaviorIndex() == null ? "component" : "behavior", + page.getPageId(), + Session.get().getId(), + subscription.getComponentPath(), + subscription.getBehaviorIndex() == null ? "" : ":" + + subscription.getBehaviorIndex()}); } PageKey pageKey = new PageKey(page.getPageId(), Session.get().getId()); if (!subscriptions.containsEntry(pageKey, subscription)) @@ -255,10 +259,10 @@ public class EventBus implements UnboundListener if (pageKey != null) { fireUnregistration(trackingId); - if (log.isInfoEnabled()) + if (log.isDebugEnabled()) { - log.info("unregistering page {} for session {}", new Object[] { - pageKey.getPageId(), pageKey.getSessionId() }); + log.debug("unregistering page {} for session {}", + pageKey.getPageId(), pageKey.getSessionId()); } } } @@ -372,7 +376,7 @@ public class EventBus implements UnboundListener @Override public synchronized void sessionUnbound(String sessionId) { - log.info("Session unbound {}", sessionId); + log.debug("Session unbound {}", sessionId); Iterator<Entry<String, PageKey>> pageIt = trackedPages.entrySet().iterator(); while (pageIt.hasNext()) {
