Skip to content

Commit 4cfbb1e

Browse files
committed
Wrap in statement to only log once, change level to warn
1 parent a61885d commit 4cfbb1e

File tree

2 files changed

+17
-4
lines changed

2 files changed

+17
-4
lines changed

src/main/kotlin/dev/arbjerg/lavalink/internal/LavalinkSocket.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,7 @@ class LavalinkSocket(private val node: LavalinkNode) : WebSocketListener(), Clos
142142
}
143143

144144
is ConnectException -> {
145-
logger.error("Failed to connect to WS of ${node.name} (${node.baseUri}), retrying in ${reconnectInterval / 1000} seconds")
146-
logger.trace("Failed to connect to WS of ${node.name} (${node.baseUri}), retrying in ${reconnectInterval / 1000} seconds", t)
145+
logger.warnOrTrace("Failed to connect to WS of ${node.name} (${node.baseUri}), retrying in ${reconnectInterval / 1000} seconds", t)
147146
}
148147

149148
is SocketException -> {
@@ -153,8 +152,7 @@ class LavalinkSocket(private val node: LavalinkNode) : WebSocketListener(), Clos
153152
return
154153
}
155154

156-
logger.error("Socket error on ${node.name}, reconnecting in ${reconnectInterval / 1000} seconds")
157-
logger.trace("Socket error on ${node.name}, reconnecting in ${reconnectInterval / 1000} seconds", t)
155+
logger.warnOrTrace("Socket error on ${node.name}, reconnecting in ${reconnectInterval / 1000} seconds", t)
158156
node.available = false
159157
open = false
160158
}
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package dev.arbjerg.lavalink.internal
2+
3+
import org.slf4j.Logger
4+
5+
/**
6+
* Log a trace message to the console.
7+
* If [Logger.isTraceEnabled] returns false, it will log [message] as warning instead.
8+
*/
9+
fun Logger.warnOrTrace(message: String, t: Throwable) {
10+
if (this.isTraceEnabled) {
11+
this.trace(message, t)
12+
} else {
13+
this.warn(message)
14+
}
15+
}

0 commit comments

Comments
 (0)