Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

osutil: pid 1 should exit directly instead of trying to kill itself

Browse Source
This commit is contained in:
Xiang Li 2015-02-19 14:52:32 -08:00
parent 88994f9ec8
commit 7ae94f2bf0
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/osutil/interrupt_unix.go
View File

@ -59,13 +59,18 @@ func HandleInterrupts() {
interruptExitMu.Lock() interruptExitMu.Lock()
log.Printf("received %v signal, shutting down", sig) log.Printf("received %v signal, shutting down...", sig)
for _, h := range ihs { for _, h := range ihs {
h() h()
} }
signal.Stop(notifier) signal.Stop(notifier)
syscall.Kill(syscall.Getpid(), sig.(syscall.Signal)) pid := syscall.Getpid()
// exit directly if it is the "init" process, since the kernel will not help to kill pid 1.
if pid == 1 {
os.Exit(0)
}
syscall.Kill(pid, sig.(syscall.Signal))
}() }()
} }