package/requests
1
0
Fork 0
mirror of https://github.com/gospider007/requests.git synced 2025-12-24 13:57:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

sync

Browse Source
This commit is contained in:
gospider
2024-12-15 15:04:53 +08:00
parent 4edba914a8
commit 1c2a6b332e
2 changed files with 39 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
conn.go
View File

@@ -150,8 +150,14 @@ func (obj *connecotr) waitBodyClose() error {
}
}
func (obj *connecotr) taskMain(task *reqTask, waitBody bool) (retry bool) {
func (obj *connecotr) taskMain(task *reqTask) (retry bool) {
defer func() {
if task.err != nil && task.option.ErrCallBack != nil {
if err2 := task.option.ErrCallBack(task.ctx, task.option, nil, task.err); err2 != nil {
retry = false
task.err = err2
}
}
if retry {
task.err = nil
obj.rawConn.CloseWithError(errors.New("taskMain retry close"))
@@ -159,7 +165,7 @@ func (obj *connecotr) taskMain(task *reqTask, waitBody bool) (retry bool) {
task.cnl()
if task.err != nil {
obj.rawConn.CloseWithError(task.err)
} else if waitBody {
} else {
if err := obj.waitBodyClose(); err != nil {
obj.rawConn.CloseWithError(err)
}
@@ -274,9 +280,6 @@ func (obj *connPool) rwMain(conn *connecotr) {
obj.safeClose()
}
}()
if err := conn.waitBodyClose(); err != nil {
return
}
for {
select {
case <-conn.safeCtx.Done(): //safe close conn
@@ -287,7 +290,7 @@ func (obj *connPool) rwMain(conn *connecotr) {
if task == nil {
return
}
if conn.taskMain(task, true) {
if conn.taskMain(task) {
obj.notice(task)
return
}