Skip to content

Commit 8021b33

Browse files
committed
add logging for websockets
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
1 parent ccb3024 commit 8021b33

2 files changed

Lines changed: 13 additions & 4 deletions

File tree

app/src/main/java/com/nextcloud/talk/webrtc/WebSocketConnectionHelper.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,13 @@ public static synchronized WebSocketInstance getExternalSignalingInstanceForServ
8686
// already retries on its own, so creating a second instance here would leave the first one
8787
// running unsupervised in the background, opening a parallel connection to the signaling
8888
// server for the same user.
89+
Log.d(TAG, "Reusing webSocketInstance " + webSocketInstance.hashCode() + " for userId " + userId);
8990
return webSocketInstance;
9091
}
9192
}
9293

94+
Log.d(TAG, "Creating new webSocketInstance for userId " + userId);
95+
9396
WebSocketInstance webSocketInstance = new WebSocketInstance(user, generatedURL, webSocketTicket);
9497
webSocketInstanceMap.put(user.getId(), webSocketInstance);
9598
return webSocketInstance;

app/src/main/java/com/nextcloud/talk/webrtc/WebSocketInstance.kt

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,12 +118,17 @@ class WebSocketInstance internal constructor(conversationUser: User, connectionU
118118
}
119119

120120
override fun onOpen(webSocket: WebSocket, response: Response) {
121-
Log.d(TAG, "Open webSocket")
121+
val previousWebSocket = internalWebSocket
122+
Log.d(
123+
TAG,
124+
"Open webSocket ${webSocket.hashCode()} (previous was ${previousWebSocket?.hashCode()})"
125+
)
122126
internalWebSocket = webSocket
123127
sendHello()
124128
}
125129

126130
private fun closeWebSocket(webSocket: WebSocket) {
131+
Log.d(TAG, "closeWebSocket ${webSocket.hashCode()}")
127132
webSocket.close(NORMAL_CLOSURE, null)
128133
webSocket.cancel()
129134
if (webSocket !== internalWebSocket) {
@@ -392,16 +397,17 @@ class WebSocketInstance internal constructor(conversationUser: User, connectionU
392397
}
393398

394399
override fun onClosing(webSocket: WebSocket, code: Int, reason: String) {
395-
Log.d(TAG, "onClosing : $code / $reason")
400+
Log.d(TAG, "onClosing : WebSocket ${webSocket.hashCode()} $code / $reason")
396401
}
397402

398403
override fun onClosed(webSocket: WebSocket, code: Int, reason: String) {
399-
Log.d(TAG, "onClosed : $code / $reason")
404+
Log.d(TAG, "onClosed : WebSocket ${webSocket.hashCode()} $code / $reason")
400405
isConnected = false
401406
}
402407

403408
override fun onFailure(webSocket: WebSocket, t: Throwable, response: Response?) {
404-
Log.e(TAG, "Error : WebSocket " + webSocket.hashCode(), t)
409+
val isCurrent = webSocket === internalWebSocket
410+
Log.e(TAG, "Error : WebSocket ${webSocket.hashCode()} (isCurrentInternalWebSocket=$isCurrent)", t)
405411
closeWebSocket(webSocket)
406412
}
407413

0 commit comments

Comments
 (0)