等到handler完成才会结束请求
This commit is contained in:
parent
22c1bfc2b2
commit
3d3a3cee40
|
|
@ -175,7 +175,6 @@ func (t *UnixSocketTask) handleConnection(conn net.Conn) {
|
||||||
client := client.NewClient()
|
client := client.NewClient()
|
||||||
|
|
||||||
handleQuestion := func(question string) {
|
handleQuestion := func(question string) {
|
||||||
logger.Debug("question: %s", question)
|
|
||||||
if loading {
|
if loading {
|
||||||
loading = false // 停止加载动画
|
loading = false // 停止加载动画
|
||||||
t.writeMessage(conn, "\r")
|
t.writeMessage(conn, "\r")
|
||||||
|
|
@ -197,6 +196,7 @@ func (t *UnixSocketTask) handleConnection(conn net.Conn) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// 结束后发送结束标记
|
// 结束后发送结束标记
|
||||||
|
t.writeMessage(conn, "\n\r")
|
||||||
t.writeMessage(conn, "[end]")
|
t.writeMessage(conn, "[end]")
|
||||||
conn.Close() // 关闭连接,防止客户端一直等待inf
|
conn.Close() // 关闭连接,防止客户端一直等待inf
|
||||||
logger.Debug("connection done.")
|
logger.Debug("connection done.")
|
||||||
|
|
|
||||||
|
|
@ -12,6 +12,7 @@ import (
|
||||||
"os"
|
"os"
|
||||||
"path"
|
"path"
|
||||||
"strings"
|
"strings"
|
||||||
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
@ -255,14 +256,18 @@ func (c *Client) PostToStream(uri string, body interface{}, query map[string]str
|
||||||
|
|
||||||
reader := bufio.NewReader(resp.Body)
|
reader := bufio.NewReader(resp.Body)
|
||||||
var buffer strings.Builder
|
var buffer strings.Builder
|
||||||
ticker := time.NewTicker(250 * time.Millisecond) // 每 250 ms处理一次
|
ticker := time.NewTicker(250 * time.Millisecond)
|
||||||
defer ticker.Stop()
|
defer ticker.Stop()
|
||||||
|
|
||||||
done := make(chan struct{})
|
done := make(chan struct{})
|
||||||
errChan := make(chan error, 1)
|
errChan := make(chan error, 1)
|
||||||
|
|
||||||
// 启动一个定时处理协程
|
var wg sync.WaitGroup
|
||||||
|
wg.Add(1)
|
||||||
|
|
||||||
|
// 处理数据的协程
|
||||||
go func() {
|
go func() {
|
||||||
|
defer wg.Done()
|
||||||
for {
|
for {
|
||||||
select {
|
select {
|
||||||
case <-ticker.C:
|
case <-ticker.C:
|
||||||
|
|
@ -271,7 +276,6 @@ func (c *Client) PostToStream(uri string, body interface{}, query map[string]str
|
||||||
buffer.Reset()
|
buffer.Reset()
|
||||||
}
|
}
|
||||||
case <-done:
|
case <-done:
|
||||||
// flush final
|
|
||||||
if buffer.Len() > 0 {
|
if buffer.Len() > 0 {
|
||||||
messageHandler(buffer.String())
|
messageHandler(buffer.String())
|
||||||
}
|
}
|
||||||
|
|
@ -280,7 +284,7 @@ func (c *Client) PostToStream(uri string, body interface{}, query map[string]str
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
|
||||||
// 读取数据的主循环
|
// 读取数据
|
||||||
go func() {
|
go func() {
|
||||||
for {
|
for {
|
||||||
chunk := make([]byte, 256)
|
chunk := make([]byte, 256)
|
||||||
|
|
@ -300,11 +304,15 @@ func (c *Client) PostToStream(uri string, body interface{}, query map[string]str
|
||||||
errChan <- nil
|
errChan <- nil
|
||||||
}()
|
}()
|
||||||
|
|
||||||
|
// 等待读取是否有错误
|
||||||
if err := <-errChan; err != nil {
|
if err := <-errChan; err != nil {
|
||||||
logger.Error("Error reading response stream")
|
logger.Error("Error reading response stream")
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 等待 messageHandler 完成处理
|
||||||
|
wg.Wait()
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue