gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #747 from a1exwang/master

Browse source 
[bugfix] Fix interrupt hook overwritten bug
This commit is contained in:
Chris Lu 2018-10-09 00:53:30 -07:00 committed by GitHub
parent 1d3f045e85 4db68669b6
commit 88ad8d3a89
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
weed/util/pprof.go
View file

@ -14,7 +14,6 @@ func SetupProfiling(cpuProfile, memProfile string) {
glog.Fatal(err)
}
pprof.StartCPUProfile(f)
defer pprof.StopCPUProfile()
OnInterrupt(func() {
pprof.StopCPUProfile()
})

25
weed/util/signal_handling.go
View file

@ -5,13 +5,16 @@ package util
import (
"os"
"os/signal"
"sync"
"syscall"
)
func OnInterrupt(fn func()) {
// deal with control+c,etc
signalChan := make(chan os.Signal, 1)
// controlling terminal close, daemon not exit
var signalChan chan os.Signal
var hooks = make([]func(), 0)
var hookLock sync.Mutex
func init() {
signalChan = make(chan os.Signal, 1)
signal.Ignore(syscall.SIGHUP)
signal.Notify(signalChan,
os.Interrupt,
@ -24,8 +27,20 @@ func OnInterrupt(fn func()) {
)
go func() {
for _ = range signalChan {
fn()
for _, hook := range hooks {
hook()
}
os.Exit(0)
}
}()
}
func OnInterrupt(fn func()) {
// prevent reentry
hookLock.Lock()
defer hookLock.Unlock()
// deal with control+c,etc
// controlling terminal close, daemon not exit
hooks = append(hooks, fn)
}