From e2d2436ceb302a421c002fe44fca22ab21ef2d1a Mon Sep 17 00:00:00 2001 From: giongto35 Date: Thu, 12 Dec 2019 02:30:14 +0800 Subject: [PATCH] Fix roomID correct --- pkg/overlord/handlers.go | 2 ++ web/js/network/socket.js | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/overlord/handlers.go b/pkg/overlord/handlers.go index 634a396d..baf46b2c 100644 --- a/pkg/overlord/handlers.go +++ b/pkg/overlord/handlers.go @@ -140,6 +140,8 @@ func (o *Server) WS(w http.ResponseWriter, r *http.Request) { // if there is no zone param, we can pic userZone := r.URL.Query().Get("zone") + log.Printf("Get Room %s Zone %s From URL %v", roomID, userZone, r.URL) + if roomID != "" { log.Printf("Detected roomID %v from URL", roomID) if workerID, ok := o.roomToWorker[roomID]; ok { diff --git a/web/js/network/socket.js b/web/js/network/socket.js index 3b111352..4121abfc 100644 --- a/web/js/network/socket.js +++ b/web/js/network/socket.js @@ -12,7 +12,7 @@ const socket = (() => { let curPacketId = ''; const init = (roomId, zone) => { - const paramString = new URLSearchParams({roomId: roomId, zone: zone}) + const paramString = new URLSearchParams({room_id: roomId, zone: zone}) conn = new WebSocket(`ws://${location.host}/ws?${paramString.toString()}`);