Skip to content

Commit af75c84

Browse files
jyxjjjhanxiangbo
authored andcommitted
chore(pkg/aria2): simplify context cancellation handling in RPC calls (OpenListTeam#1705)
1 parent 41029a4 commit af75c84

File tree

1 file changed

+8
-13
lines changed

1 file changed

+8
-13
lines changed

pkg/aria2/rpc/call.go

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -69,14 +69,11 @@ func (h *httpCaller) setNotifier(ctx context.Context, u url.URL, notifier Notifi
6969
go func() {
7070
defer h.wg.Done()
7171
defer conn.Close()
72-
select {
73-
case <-ctx.Done():
74-
conn.SetWriteDeadline(time.Now().Add(time.Second))
75-
if err := conn.WriteMessage(websocket.CloseMessage,
76-
websocket.FormatCloseMessage(websocket.CloseNormalClosure, "")); err != nil {
77-
log.Printf("sending websocket close message: %v", err)
78-
}
79-
return
72+
<-ctx.Done()
73+
conn.SetWriteDeadline(time.Now().Add(time.Second))
74+
if err := conn.WriteMessage(websocket.CloseMessage,
75+
websocket.FormatCloseMessage(websocket.CloseNormalClosure, "")); err != nil {
76+
log.Printf("sending websocket close message: %v", err)
8077
}
8178
}()
8279
h.wg.Add(1)
@@ -251,11 +248,9 @@ func (w websocketCaller) Call(method string, params, reply interface{}) (err err
251248
return errors.New("sending channel blocking")
252249
}
253250

254-
select {
255-
case <-ctx.Done():
256-
if err := ctx.Err(); err == context.DeadlineExceeded {
257-
return err
258-
}
251+
<-ctx.Done()
252+
if err := ctx.Err(); err == context.DeadlineExceeded {
253+
return err
259254
}
260255
return
261256
}

0 commit comments

Comments
 (0)