refactor: move broadcast package to websocket
- update import paths to reflect the new package name
- change function call to use the new websocket package
- adjust client iteration to use the renamed Clients variable
🤖
This commit is contained in:
parent
aab6896c7d
commit
6ffd9f1e38
2 changed files with 3 additions and 5 deletions
|
@ -3,7 +3,6 @@ package server
|
||||||
import (
|
import (
|
||||||
"flag"
|
"flag"
|
||||||
"fmt"
|
"fmt"
|
||||||
"git.smsvc.net/pomodoro/GoTomato/internal/broadcast"
|
|
||||||
"git.smsvc.net/pomodoro/GoTomato/internal/websocket"
|
"git.smsvc.net/pomodoro/GoTomato/internal/websocket"
|
||||||
"git.smsvc.net/pomodoro/GoTomato/pkg/models"
|
"git.smsvc.net/pomodoro/GoTomato/pkg/models"
|
||||||
"log"
|
"log"
|
||||||
|
@ -24,7 +23,7 @@ func Start() {
|
||||||
listen := fmt.Sprintf("%s:%d", serverConfig.ListenAddress, serverConfig.ListenPort)
|
listen := fmt.Sprintf("%s:%d", serverConfig.ListenAddress, serverConfig.ListenPort)
|
||||||
|
|
||||||
http.HandleFunc("/ws", websocket.HandleConnections)
|
http.HandleFunc("/ws", websocket.HandleConnections)
|
||||||
go broadcast.SendPermanentBroadCastMessage()
|
go websocket.SendPermanentBroadCastMessage()
|
||||||
|
|
||||||
log.Printf("Pomodoro WebSocket server started on %s\n", listen)
|
log.Printf("Pomodoro WebSocket server started on %s\n", listen)
|
||||||
err := http.ListenAndServe(listen, nil)
|
err := http.ListenAndServe(listen, nil)
|
||||||
|
|
|
@ -1,9 +1,8 @@
|
||||||
package broadcast
|
package websocket
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"git.smsvc.net/pomodoro/GoTomato/internal/shared"
|
"git.smsvc.net/pomodoro/GoTomato/internal/shared"
|
||||||
ws "git.smsvc.net/pomodoro/GoTomato/internal/websocket"
|
|
||||||
"github.com/gorilla/websocket"
|
"github.com/gorilla/websocket"
|
||||||
"log"
|
"log"
|
||||||
"time"
|
"time"
|
||||||
|
@ -19,7 +18,7 @@ func SendPermanentBroadCastMessage() {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
// Iterate over all connected clients and broadcast the message
|
// Iterate over all connected clients and broadcast the message
|
||||||
for _, client := range ws.Clients {
|
for _, client := range Clients {
|
||||||
err := client.SendMessage(websocket.TextMessage, jsonMessage)
|
err := client.SendMessage(websocket.TextMessage, jsonMessage)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Printf("Error broadcasting to client: %v", err)
|
log.Printf("Error broadcasting to client: %v", err)
|
Loading…
Reference in a new issue