Compare commits

...

3 commits

Author SHA1 Message Date
16beea02ca feat: introduce const for broadcast interval
- change ticker to use BROADCAST_INTERVAL constant
- define BROADCAST_INTERVAL as 1 second

🤖
2024-11-21 21:50:25 +01:00
f13bdff03f feat: improve broadcast loop ticker
- rename tick to ticker for clarity
- change infinite loop to range over ticker channel
- add defer statement to stop the ticker properly
- remove unnecessary channel receive operation

🤖
2024-11-21 21:50:25 +01:00
af5b578cb3 refactor: drop SendMessage() and merge into SendPermanentBroadCastMessage() 2024-11-21 21:50:25 +01:00
3 changed files with 6 additions and 11 deletions

View file

@ -11,9 +11,10 @@ import (
// Sends continous messages to all connected WebSocket clients // Sends continous messages to all connected WebSocket clients
func SendPermanentBroadCastMessage() { func SendPermanentBroadCastMessage() {
tick := time.NewTicker(time.Second) ticker := time.NewTicker(BROADCAST_INTERVAL * time.Second)
defer ticker.Stop()
for { for range ticker.C {
// Marshal the message into JSON format // Marshal the message into JSON format
jsonMessage, err := json.Marshal(shared.State) jsonMessage, err := json.Marshal(shared.State)
if err != nil { if err != nil {
@ -25,13 +26,12 @@ func SendPermanentBroadCastMessage() {
mu.Lock() mu.Lock()
for _, client := range Clients { for _, client := range Clients {
// Send message to client // Send message to client
err := client.SendMessage(websocket.TextMessage, jsonMessage) client.Conn.SetWriteDeadline(time.Now().Add(SEND_TIMEOUT * time.Second))
err := client.Conn.WriteMessage(websocket.TextMessage, jsonMessage)
if err != nil { if err != nil {
helper.Logger.Error("Error broadcasting to client:", "msg", err, "host", client.RealIP, "clients", len(Clients)) helper.Logger.Error("Error broadcasting to client:", "msg", err, "host", client.RealIP, "clients", len(Clients))
} }
} }
mu.Unlock() mu.Unlock()
<-tick.C
} }
} }

View file

@ -7,6 +7,7 @@ import (
"git.smsvc.net/pomodoro/GoTomato/pkg/models" "git.smsvc.net/pomodoro/GoTomato/pkg/models"
) )
const BROADCAST_INTERVAL = 1
const SEND_TIMEOUT = 10 const SEND_TIMEOUT = 10
const STALE_CLIENT_TIMEOUT = 90 const STALE_CLIENT_TIMEOUT = 90
const STALE_CHECK_INTERVALL = 30 const STALE_CHECK_INTERVALL = 30

View file

@ -19,9 +19,3 @@ type WebsocketClient struct {
LastPong time.Time LastPong time.Time
RealIP string RealIP string
} }
// Sends a message to the websocket.
func (c *WebsocketClient) SendMessage(messageType int, data []byte) error {
c.Conn.SetWriteDeadline(time.Now().Add(TIMEOUT * time.Second))
return c.Conn.WriteMessage(messageType, data)
}