From 38344f597c5e81c26decbb85de1e5bbf00430130 Mon Sep 17 00:00:00 2001 From: Kazuhiro Sera Date: Tue, 14 Jan 2025 13:25:00 +0900 Subject: [PATCH] Fix #1417 Change socket mode ping/pong from debug to trace --- .../com/slack/api/socket_mode/SocketModeClient.java | 8 ++++---- .../socket_mode/impl/SocketModeClientJavaWSImpl.java | 12 ++++++------ .../socket_mode/impl/SocketModeClientTyrusImpl.java | 12 ++++++------ .../impl/JakartaSocketModeClientTyrusImpl.java | 12 ++++++------ 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/slack-api-client/src/main/java/com/slack/api/socket_mode/SocketModeClient.java b/slack-api-client/src/main/java/com/slack/api/socket_mode/SocketModeClient.java index 76602dc76..140d5d962 100644 --- a/slack-api-client/src/main/java/com/slack/api/socket_mode/SocketModeClient.java +++ b/slack-api-client/src/main/java/com/slack/api/socket_mode/SocketModeClient.java @@ -185,15 +185,15 @@ default void initializeSessionMonitorExecutor(long intervalMillis) { final AtomicLong nextInvocationMillis = new AtomicLong(System.currentTimeMillis()); executorService.scheduleWithFixedDelay(() -> { long startMillis = System.currentTimeMillis(); - if (getLogger().isDebugEnabled()) { - getLogger().debug("Checking the current session..."); + if (getLogger().isTraceEnabled()) { + getLogger().trace("Checking the current session..."); } if (isAutoReconnectEnabled() && nextInvocationMillis.get() <= System.currentTimeMillis()) { nextInvocationMillis.set(maintainCurrentSession()); } - if (getLogger().isDebugEnabled()) { + if (getLogger().isTraceEnabled()) { long spentMillis = System.currentTimeMillis() - startMillis; - getLogger().debug("The session maintenance completed in {} milliseconds", spentMillis); + getLogger().trace("The session maintenance completed in {} milliseconds", spentMillis); } }, 5_000L, intervalMillis, TimeUnit.MILLISECONDS); if (getLogger().isDebugEnabled()) { diff --git a/slack-api-client/src/main/java/com/slack/api/socket_mode/impl/SocketModeClientJavaWSImpl.java b/slack-api-client/src/main/java/com/slack/api/socket_mode/impl/SocketModeClientJavaWSImpl.java index 24caf7afa..694e6ed3c 100644 --- a/slack-api-client/src/main/java/com/slack/api/socket_mode/impl/SocketModeClientJavaWSImpl.java +++ b/slack-api-client/src/main/java/com/slack/api/socket_mode/impl/SocketModeClientJavaWSImpl.java @@ -130,15 +130,15 @@ public void connect() { public boolean verifyConnection() { if (this.currentSession != null && this.currentSession.isOpen()) { try { - if (getLogger().isDebugEnabled()) { - getLogger().debug("Sending a ping message"); + if (getLogger().isTraceEnabled()) { + getLogger().trace("Sending a ping message"); } this.currentSession.sendPing(); long waitMillis = 0L; while (waitMillis <= 3_000L) { if (this.currentSession.isPongReceived()) { - if (getLogger().isDebugEnabled()) { - getLogger().debug("Received a pong message"); + if (getLogger().isTraceEnabled()) { + getLogger().trace("Received a pong message"); } return true; } @@ -152,8 +152,8 @@ public boolean verifyConnection() { e.getMessage() ); } - if (getLogger().isDebugEnabled()) { - getLogger().debug("Failed to receive a pong message"); + if (getLogger().isTraceEnabled()) { + getLogger().trace("Failed to receive a pong message"); } } return false; diff --git a/slack-api-client/src/main/java/com/slack/api/socket_mode/impl/SocketModeClientTyrusImpl.java b/slack-api-client/src/main/java/com/slack/api/socket_mode/impl/SocketModeClientTyrusImpl.java index b3ac1ff23..680d3ad2d 100644 --- a/slack-api-client/src/main/java/com/slack/api/socket_mode/impl/SocketModeClientTyrusImpl.java +++ b/slack-api-client/src/main/java/com/slack/api/socket_mode/impl/SocketModeClientTyrusImpl.java @@ -187,8 +187,8 @@ public void connect() { public boolean verifyConnection() { if (this.currentSession != null && this.currentSession.isOpen()) { String ping = "ping-pong_" + currentSession.getId(); - if (getLogger().isDebugEnabled()) { - getLogger().debug("Sending a ping message: {}", ping); + if (getLogger().isTraceEnabled()) { + getLogger().trace("Sending a ping message: {}", ping); } ByteBuffer pingBytes = ByteBuffer.wrap(ping.getBytes()); try { @@ -199,8 +199,8 @@ public boolean verifyConnection() { while (waitMillis <= 3_000L) { String pong = latestPong.getAndSet(null); if (pong != null && pong.equals(ping)) { - if (getLogger().isDebugEnabled()) { - getLogger().debug("Received a pong message: {}", ping); + if (getLogger().isTraceEnabled()) { + getLogger().trace("Received a pong message: {}", ping); } return true; } @@ -213,8 +213,8 @@ public boolean verifyConnection() { this.currentSession.getId(), e.getMessage()); } - if (getLogger().isDebugEnabled()) { - getLogger().debug("Failed to receive a pong message: {}", ping); + if (getLogger().isTraceEnabled()) { + getLogger().trace("Failed to receive a pong message: {}", ping); } } return false; diff --git a/slack-jakarta-socket-mode-client/src/main/java/com/slack/api/jakarta_socket_mode/impl/JakartaSocketModeClientTyrusImpl.java b/slack-jakarta-socket-mode-client/src/main/java/com/slack/api/jakarta_socket_mode/impl/JakartaSocketModeClientTyrusImpl.java index 3720b83e0..8586de5f8 100644 --- a/slack-jakarta-socket-mode-client/src/main/java/com/slack/api/jakarta_socket_mode/impl/JakartaSocketModeClientTyrusImpl.java +++ b/slack-jakarta-socket-mode-client/src/main/java/com/slack/api/jakarta_socket_mode/impl/JakartaSocketModeClientTyrusImpl.java @@ -187,8 +187,8 @@ public void connect() { public boolean verifyConnection() { if (this.currentSession != null && this.currentSession.isOpen()) { String ping = "ping-pong_" + currentSession.getId(); - if (getLogger().isDebugEnabled()) { - getLogger().debug("Sending a ping message: {}", ping); + if (getLogger().isTraceEnabled()) { + getLogger().trace("Sending a ping message: {}", ping); } ByteBuffer pingBytes = ByteBuffer.wrap(ping.getBytes()); try { @@ -199,8 +199,8 @@ public boolean verifyConnection() { while (waitMillis <= 3_000L) { String pong = latestPong.getAndSet(null); if (pong != null && pong.equals(ping)) { - if (getLogger().isDebugEnabled()) { - getLogger().debug("Received a pong message: {}", ping); + if (getLogger().isTraceEnabled()) { + getLogger().trace("Received a pong message: {}", ping); } return true; } @@ -213,8 +213,8 @@ public boolean verifyConnection() { this.currentSession.getId(), e.getMessage()); } - if (getLogger().isDebugEnabled()) { - getLogger().debug("Failed to receive a pong message: {}", ping); + if (getLogger().isTraceEnabled()) { + getLogger().trace("Failed to receive a pong message: {}", ping); } } return false;