lingling
/
tiny-rdm
mirror of https://github.com/tiny-craft/tiny-rdm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: stop command monitor may block ui (#326)

This commit is contained in:
Lykin 2024-08-15 12:33:51 +08:00
parent 5efbd4d316
commit c38944e948
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/services/monitor_service.go
View File

@ -89,7 +89,7 @@ func (c *monitorService) StartMonitor(server string) (resp types.JSResp) {
item.cmd = item.client.Monitor(c.ctx, item.ch) item.cmd = item.client.Monitor(c.ctx, item.ch)
item.cmd.Start() item.cmd.Start()
go c.processMonitor(&item.mutex, item.ch, item.closeCh, item.eventName) go c.processMonitor(&item.mutex, item.ch, item.closeCh, item.cmd, item.eventName)
resp.Success = true resp.Success = true
resp.Data = struct { resp.Data = struct {
EventName string `json:"eventName"` EventName string `json:"eventName"`
@ -99,7 +99,7 @@ func (c *monitorService) StartMonitor(server string) (resp types.JSResp) {
return return
} }
func (c *monitorService) processMonitor(mutex *sync.Mutex, ch <-chan string, closeCh <-chan struct{}, eventName string) { func (c *monitorService) processMonitor(mutex *sync.Mutex, ch <-chan string, closeCh <-chan struct{}, cmd *redis.MonitorCmd, eventName string) {
lastEmitTime := time.Now().Add(-1 * time.Minute) lastEmitTime := time.Now().Add(-1 * time.Minute)
cache := make([]string, 0, 1000) cache := make([]string, 0, 1000)
for { for {
@ -120,6 +120,7 @@ func (c *monitorService) processMonitor(mutex *sync.Mutex, ch <-chan string, clo
case <-closeCh: case <-closeCh:
// monitor stopped // monitor stopped
cmd.Stop()
return return
} }
} }
@ -136,7 +137,6 @@ func (c *monitorService) StopMonitor(server string) (resp types.JSResp) {
return return
} }
item.cmd.Stop()
//close(item.ch) //close(item.ch)
close(item.closeCh) close(item.closeCh)
delete(c.items, server) delete(c.items, server)