Skip to content

Issue #400: ignore SIGHUP #403

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
magiconair merged 3 commits into from
Dec 10, 2017
Merged

Issue #400: ignore SIGHUP #403

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
62344bd
cannot catch SIGKILL
magiconair Dec 10, 2017
240e09f
Issue #400: do not exit on SIGHUP
magiconair Dec 10, 2017
9e3b3f9
log caught signal and reaction
magiconair Dec 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 28 additions & 11 deletions exit/listen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,39 @@ var wg sync.WaitGroup
var quit = make(chan bool)

// Listen registers an exit handler which is called on
// SIGINT/SIGKILL/SIGTERM or when Exit/Fatal/Fatalf is called.
// SIGINT/SIGTERM or when Exit/Fatal/Fatalf is called.
// SIGHUP is ignored since that is usually used for
// triggering a reload of configuration which isn't
// supported but shouldn't kill the process either.
func Listen(fn func(os.Signal)) {
wg.Add(1)
go func() {
defer wg.Done()
// we use buffered to mitigate losing the signal
sigchan := make(chan os.Signal, 1)
signal.Notify(sigchan, os.Interrupt, os.Kill, syscall.SIGTERM)
for {
sigchan := make(chan os.Signal, 1)
signal.Notify(sigchan, os.Interrupt, syscall.SIGTERM, syscall.SIGHUP)

var sig os.Signal
select {
case sig = <-sigchan:
case <-quit:
}
if fn != nil {
fn(sig)
var sig os.Signal
select {
case sig = <-sigchan:
switch sig {
case syscall.SIGHUP:
log.Print("[INFO] Caught SIGHUP. Ignoring")
continue
case os.Interrupt:
log.Print("[INFO] Caught SIGINT. Exiting")
case syscall.SIGTERM:
log.Print("[INFO] Caught SIGTERM. Exiting")
default:
// fallthrough in case we forgot to add a switch clause.
log.Printf("[INFO] Caught signal %v. Exiting", sig)
}
case <-quit:
}
if fn != nil {
fn(sig)
}
return
}
}()
}
Expand Down
⚡