gojs/gojs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug for WaitAll

Browse Source
This commit is contained in:
Star 2025-07-18 22:40:17 +08:00
parent e8219eb1ec
commit 7bae8c77a2
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gojs.go
View File

@ -192,12 +192,11 @@ func WaitAll() {
sigCh := make(chan os.Signal, 1) sigCh := make(chan os.Signal, 1)
signal.Notify(sigCh, os.Interrupt, syscall.SIGTERM, syscall.SIGINT, syscall.SIGHUP) signal.Notify(sigCh, os.Interrupt, syscall.SIGTERM, syscall.SIGINT, syscall.SIGHUP)
go func() { go func() {
for { for sig := range sigCh {
select {
case sig := <-sigCh:
if stopped { if stopped {
break break
} }
stopped = true
// send signal // send signal
for _, fn := range onSignals { for _, fn := range onSignals {
fn(sig) fn(sig)
@ -213,7 +212,6 @@ func WaitAll() {
break break
} }
} }
}
}() }()
// 一些必须在主线程运行的代码在这运行（例如 apigo.cc/gojs/client） // 一些必须在主线程运行的代码在这运行（例如 apigo.cc/gojs/client）
for _, fn := range runInMainFuncs { for _, fn := range runInMainFuncs {
@ -231,9 +229,12 @@ func WaitAll() {
}(fn) }(fn)
} }
<-waitChan <-waitChan
if !stopped {
// 优雅的关闭信号等待线程
stopped = true stopped = true
sigCh <- syscall.SIGTERM sigCh <- syscall.SIGTERM
} }
}
} }
func RunFile(file string, args ...any) (any, error) { func RunFile(file string, args ...any) (any, error) {