martin/databag
1
0
Fork 0
mirror of https://github.com/balzack/databag.git synced 2025-02-12 03:29:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

gracefully exit websocket on server exit

Browse Source
This commit is contained in:
Roland Osborne 2022-01-14 14:14:51 -08:00
parent a9ce9c938e
commit 2327c774f3
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
net/server/internal/api_status.go
View File

@ -30,6 +30,7 @@ type accountRevision struct {
}
var wsSync sync.Mutex
var wsExit = make(chan bool, 1)
var statusListener = make(map[uint][]chan<-[]byte)
var upgrader = websocket.Upgrader{}
@ -52,7 +53,7 @@ func Status(w http.ResponseWriter, r *http.Request) {
err = store.DB.Model(&Revision{}).Where("ID = ?", act).First(&ar).Error
if err != nil {
log.Println("Status - failed to get account revision")
return
// return
}
rev := getRevision(ar)
@ -78,13 +79,20 @@ func Status(w http.ResponseWriter, r *http.Request) {
defer RemoveStatusListener(act, c)
// send revision until channel is closed
for msg := range c {
err = conn.WriteMessage(websocket.TextMessage, msg)
if err != nil {
log.Println("Status - failed to send revision, closing")
return
}
}
for {
select {
case msg := <-c:
err = conn.WriteMessage(websocket.TextMessage, msg)
if err != nil {
log.Println("Status - failed to send revision, closing")
return
}
case <-wsExit:
log.Println("Status - server exit")
wsExit<-true
return
}
}
}
func getRevision(rev accountRevision) Revision {
@ -99,6 +107,10 @@ func getRevision(rev accountRevision) Revision {
return r
}
func ExitStatus() {
wsExit <- true
}
func SetStatus(act uint) {
// get revisions for the account