Merge pull request #730 from rurirei/stoploop

stoploop update
This commit is contained in:
2dust
2020-11-16 13:18:46 +08:00
committed by GitHub

View File

@@ -99,9 +99,7 @@ func (v *V2RayPoint) StopLoop() (err error) {
v.v2rayOP.Lock() v.v2rayOP.Lock()
defer v.v2rayOP.Unlock() defer v.v2rayOP.Unlock()
if v.status.IsRunning { if v.status.IsRunning {
close(v.closeChan)
v.shutdownInit() v.shutdownInit()
v.SupportSet.OnEmitStatus(0, "Closed")
} }
return return
} }
@@ -124,12 +122,16 @@ func (v V2RayPoint) QueryStats(tag string, direct string) int64 {
} }
func (v *V2RayPoint) shutdownInit() { func (v *V2RayPoint) shutdownInit() {
v.status.IsRunning = false close(v.closeChan)
v.statsManager = nil
v.status.Vpoint.Close() v.status.Vpoint.Close()
v.status.Vpoint = nil v.status.Vpoint = nil
v.statsManager = nil v.status.IsRunning = false
v.escorter.EscortingDown() v.escorter.EscortingDown()
v.SupportSet.Shutdown() v.SupportSet.Shutdown()
v.SupportSet.OnEmitStatus(0, "Closed")
} }
func (v *V2RayPoint) pointloop() error { func (v *V2RayPoint) pointloop() error {