Skip to content

Commit e59c59b

Browse files
committed
Do'h; do it correct
1 parent 0b6b90a commit e59c59b

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

handlers/loader.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,14 +99,16 @@ func (l *loaderT) sendJSON(r *http.Request, id zint.Uint128, data interface{}) {
9999
defer c.Unlock()
100100
w, err := c.conn.NextWriter(websocket.TextMessage)
101101
if err != nil {
102+
if w != nil {
103+
w.Close()
104+
}
102105
zlog.Fields(zlog.F{
103106
"connectID": id,
104107
"siteID": Site(r.Context()).ID,
105108
"userID": User(r.Context()).ID,
106109
}).FieldsRequest(r).Errorf("loader.send: NextWriter: %s", err)
107110
return
108111
}
109-
defer w.Close()
110112

111113
j, err := json.Marshal(data)
112114
if err != nil {
@@ -119,6 +121,7 @@ func (l *loaderT) sendJSON(r *http.Request, id zint.Uint128, data interface{}) {
119121
}
120122

121123
_, err = w.Write(j)
124+
w.Close()
122125
if err != nil {
123126
zlog.Fields(zlog.F{
124127
"connectID": id,

0 commit comments

Comments
 (0)