mirrors/dae
1
0
Fork 0
mirror of https://github.com/daeuniverse/dae.git synced 2025-07-31 07:09:48 +07:00
Code Issues Packages Projects Releases Wiki Activity

chore: send real ready after listening and clean up thoroughly

Browse Source
This commit is contained in:
mzz2017
2023-02-27 14:36:36 +08:00
parent 7783498c03
commit 2525c0658d
3 changed files with 54 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cmd/run.go
View File

@ -68,8 +68,12 @@ func Run(log *logrus.Logger, conf *config.Config) (err error) {
sigs := make(chan os.Signal, 1)
signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM, syscall.SIGHUP, syscall.SIGQUIT, syscall.SIGKILL, syscall.SIGILL, syscall.SIGUSR1)
go func() {
sdnotify.Ready()
if listener, err = c.ListenAndServe(conf.Global.TproxyPort); err != nil {
readyChan := make(chan bool, 1)
go func() {
<-readyChan
sdnotify.Ready()
}()
if listener, err = c.ListenAndServe(readyChan, conf.Global.TproxyPort); err != nil {
log.Errorln("ListenAndServe:", err)
}
sigs <- nil
@ -82,13 +86,16 @@ loop:
if reloading {
reloading = false
log.Warnln("[Reload] Serve")
sdnotify.Ready()
readyChan := make(chan bool, 1)
go func() {
if err := c.Serve(listener); err != nil {
if err := c.Serve(readyChan, listener); err != nil {
log.Errorln("ListenAndServe:", err)
}
sigs <- nil
}()
<-readyChan
sdnotify.Ready()
log.Warnln("[Reload] Finished")
} else {
break loop
}