fix error result cache

server/src/core/core.go

@@ -4,8 +4,9 @@ import "sync"
 
 // Core ...
 type Core struct {
-	pool map[[16]byte]*row
+	serial int
-	mux  sync.Mutex
+	pool   map[[16]byte]*row
+	mux    sync.Mutex
 }
 
 // NewCore ...

server/src/core/fetch.go

@@ -11,14 +11,14 @@ import (
 	"time"
 )
 
-func (pr *row) fetchRemote() (ab []byte, ok bool, err error) {
+func (pr *row) fetchRemote() (ab []byte, err error) {
 
 	r := pr.req
 	b := pr.log
 
 	u, err := url.Parse(config.OpenAIBase + r.Url)
 	if err != nil {
-		return nil, false, err
+		return nil, err
 	}
 	// zj.J(`real url`, u.String())
 
@@ -39,9 +39,7 @@ func (pr *row) fetchRemote() (ab []byte, ok bool, err error) {
 		return
 	}
 
-	if rsp.StatusCode >= 200 || rsp.StatusCode < 300 {
+	if rsp.StatusCode < 200 || rsp.StatusCode >= 300 {
-		ok = true
-	} else {
 		err = fmt.Errorf(`status code fail: %d`, rsp.StatusCode)
 		b.WriteString(err.Error())
 	}

server/src/core/pool.go

@@ -19,11 +19,14 @@ func (c *Core) add(req *pb.Req, hr *http.Request) (pr *row, cached bool) {
 		return
 	}
 
+	c.serial++
 	pr = &row{
-		hr:   hr,
+		serial: c.serial,
-		hash: hash,
+		hr:     hr,
-		req:  req,
+		hash:   hash,
-		t:    time.Now(),
+		req:    req,
+		t:      time.Now(),
+		core:   c,
 	}
 	pr.mux.Lock()
 	go pr.run()
@@ -31,3 +34,12 @@ func (c *Core) add(req *pb.Req, hr *http.Request) (pr *row, cached bool) {
 	c.mux.Unlock()
 	return
 }
+
+func (c *Core) delete(r *row) {
+	c.mux.Lock()
+	pr, ok := c.pool[r.hash]
+	if ok && pr == r {
+		delete(c.pool, r.hash)
+	}
+	c.mux.Unlock()
+}

server/src/core/row.go

@@ -11,15 +11,22 @@ import (
 )
 
 type row struct {
-	hash [16]byte
+	serial int
-	hr   *http.Request
+	hash   [16]byte
-	req  *pb.Req
+	hr     *http.Request
-	rsp  []byte
+	req    *pb.Req
-	err  error
+	rsp    []byte
-	done bool
+	err    error
-	t    time.Time
+	done   bool
-	mux  sync.RWMutex
+	t      time.Time
-	log  *bytes.Buffer
+	mux    sync.RWMutex
+	log    *bytes.Buffer
+	core   *Core
+}
+
+func (pr *row) suicide() {
+	pr.core.delete(pr)
+	pr.core = nil
 }
 
 func (pr *row) run() {
@@ -33,20 +40,20 @@ func (pr *row) run() {
 		// return
 	}
 
-	var ok bool
+	pr.rsp, pr.err = pr.fetchRemote()
-	pr.rsp, ok, pr.err = pr.fetchRemote()
-	if pr.err == nil && ok {
-		// pr.failLog.Reset()
-		go writeFailLog(pr.hash, pr.log.Bytes())
-	} else {
-		go writeFailLog(pr.hash, pr.log.Bytes())
-	}
-
-	go pr.saveFile()
-	// go pr.metrics()
-
 	pr.done = true
 	pr.mux.Unlock()
+
+	// go pr.metrics()
+
+	if pr.err == nil {
+		// pr.failLog.Reset()
+		// go writeFailLog(pr.hash, pr.log.Bytes())
+		go pr.saveFile()
+	} else {
+		go writeFailLog(pr.hash, pr.log.Bytes())
+		go pr.suicide()
+	}
 }
 
 func (pr *row) wait() {