dave/youtube-downloader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix memory leak in server

Browse Source 
Remove server instrumentation
This commit is contained in:
David Majdandžić
2024-06-27 11:16:25 +02:00
parent 4ca3053243
commit 51a94b6636
3 changed files with 47 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
ws-server/connection.go
View File

@@ -53,39 +53,40 @@ func (ws *WSConnection) messageReader() {
for {
_, message, err := ws.conn.ReadMessage()
if !ws.alive {
return
break
}
ws.conn.SetReadDeadline(time.Now().Add(ws.IdleTimeout))
if err != nil {
ws.ErrorChan <- err
return
break
}
log.Printf("Client %d: Received: %s, %d in output channel", ws.id, message, len(ws.ReadChan))
ws.ReadChan <- string(message)
}
log.Printf("Client %d: Stopped reading messages", ws.id)
}
func (ws *WSConnection) messageSender() {
log.Printf("Client %d: Sending messages", ws.id)
for {
func() {
msg, ok := <-ws.WriteChan
if !ok || !ws.alive {
return
}
ws.writeLock.Lock()
defer ws.writeLock.Unlock()
ws.conn.SetWriteDeadline(time.Now().Add(ws.IdleTimeout))
log.Printf("Client %d: Sending: %s, %d in input channel", ws.id, msg, len(ws.WriteChan))
err := ws.conn.WriteMessage(websocket.TextMessage, []byte(msg))
if err != nil {
log.Printf("Client %d: Error during message writing: %v", ws.id, err)
ws.ErrorChan <- err
return
}
}()
msg, ok := <-ws.WriteChan
if !ok || !ws.alive {
break
}
ws.writeLock.Lock()
ws.conn.SetWriteDeadline(time.Now().Add(ws.IdleTimeout))
log.Printf("Client %d: Sending: %s, %d in input channel", ws.id, msg, len(ws.WriteChan))
err := ws.conn.WriteMessage(websocket.TextMessage, []byte(msg))
if err != nil {
log.Printf("Client %d: Error during message writing: %v", ws.id, err)
ws.ErrorChan <- err
ws.writeLock.Unlock()
break
}
ws.writeLock.Unlock()
}
log.Printf("Client %d: Stopped sending messages", ws.id)
}
func (ws *WSConnection) pinger() {
@@ -93,7 +94,7 @@ func (ws *WSConnection) pinger() {
for {
time.Sleep(ws.PingInterval)
if !ws.alive {
return
break
}
// log.Printf("Client %d: Ping", ws.id)
@@ -102,10 +103,11 @@ func (ws *WSConnection) pinger() {
if err != nil {
log.Printf("Client %d: Error during ping: %+v", ws.id, err)
ws.ErrorChan <- err
return
break
}
ws.conn.SetWriteDeadline(time.Now().Add(ws.IdleTimeout))
ws.writeLock.Unlock()
// log.Printf("Client %d: Ping OK", ws.id)
}
log.Printf("Client %d: Stopped pinger", ws.id)
}