From: qydysky <qydysky@foxmail.com>
Date: Tue, 22 Sep 2020 14:08:25 +0000 (+0800)
Subject: 81
X-Git-Tag: v0.0.2~6
X-Git-Url: http://127.0.0.1:8081/?a=commitdiff_plain;h=5050288b80d4b6895052555d220c317814a8f452;p=part%2F.git

81
---

diff --git a/Reqf.go b/Reqf.go
index 5976c93..1ce827b 100644
--- a/Reqf.go
+++ b/Reqf.go
@@ -35,7 +35,9 @@ type req struct {
     ResponseCode int
     Respon []byte
     UsedTime time.Duration
-    Cancel chan interface{}
+
+    cancelOpen bool
+    cancel chan interface{}
     sync.Mutex
 }
 
@@ -64,8 +66,13 @@ func (this *req) Reqf(val Rval) (error) {
     if _val.Timeout==0{_val.Timeout=3}
 
 	for ;_val.Retry>=0;_val.Retry-- {
-		returnErr=this.Reqf_1(_val)
-        if returnErr==nil {break}
+        returnErr=this.Reqf_1(_val)
+        select {
+        case <- this.cancel://cancel
+            break
+        default:
+            if returnErr==nil {break}
+        }
         time.Sleep(time.Duration(_val.SleepTime)*time.Millisecond)
     }
 
@@ -122,8 +129,9 @@ func (this *req) Reqf_1(val Rval) (error) {
     req = req.WithContext(cx)
 
     go func(){
-        this.Cancel = make(chan interface{})
-        <- this.Cancel
+        this.cancel = make(chan interface{})
+        this.cancelOpen = true
+        <- this.cancel
         cancel()
     }()
 
@@ -174,4 +182,15 @@ func (this *req) Reqf_1(val Rval) (error) {
     this.UsedTime=time.Since(beginTime)
     
     return nil
+}
+
+func (t *req) Close(){
+    if !t.cancelOpen {return}
+    select {
+    case <- t.cancel://had close
+        return
+    default:
+        close(t.cancel)
+        t.cancelOpen = false
+    }
 }
\ No newline at end of file