aboutsummaryrefslogtreecommitdiffstats
path: root/util/interrupt
diff options
context:
space:
mode:
Diffstat (limited to 'util/interrupt')
-rw-r--r--util/interrupt/cleaner.go28
-rw-r--r--util/interrupt/cleaner_test.go33
2 files changed, 48 insertions, 13 deletions
diff --git a/util/interrupt/cleaner.go b/util/interrupt/cleaner.go
index 58dd6b07..3f6c3afb 100644
--- a/util/interrupt/cleaner.go
+++ b/util/interrupt/cleaner.go
@@ -14,19 +14,21 @@ var cleaners []Cleaner
var active = false
// RegisterCleaner is responsible for regisreting a cleaner function. When a function is registered, the Signal watcher is started in a goroutine.
-func RegisterCleaner(f Cleaner) {
- cleaners = append(cleaners, f)
- if !active {
- active = true
- go func() {
- ch := make(chan os.Signal, 1)
- signal.Notify(ch, syscall.SIGINT, syscall.SIGTERM, os.Interrupt)
- <-ch
- // Prevent un-terminated ^C character in terminal
- fmt.Println()
- clean()
- os.Exit(1)
- }()
+func RegisterCleaner(f ...Cleaner) {
+ for _, fn := range f {
+ cleaners = append(cleaners, fn)
+ if !active {
+ active = true
+ go func() {
+ ch := make(chan os.Signal, 1)
+ signal.Notify(ch, syscall.SIGINT, syscall.SIGTERM, os.Interrupt)
+ <-ch
+ // Prevent un-terminated ^C character in terminal
+ fmt.Println()
+ clean()
+ os.Exit(1)
+ }()
+ }
}
}
diff --git a/util/interrupt/cleaner_test.go b/util/interrupt/cleaner_test.go
new file mode 100644
index 00000000..f839c0dc
--- /dev/null
+++ b/util/interrupt/cleaner_test.go
@@ -0,0 +1,33 @@
+package interrupt
+
+import (
+ "testing"
+)
+
+func TestRegister(t *testing.T) {
+ active = true // this prevents goroutine from being started during the tests
+
+ f := func() error {
+ return nil
+ }
+ f2 := func() error {
+ return nil
+ }
+ f3 := func() error {
+ return nil
+ }
+ RegisterCleaner(f)
+ RegisterCleaner(f2, f3)
+ count := 0
+ for _, fn := range cleaners {
+ errt := fn()
+ count++
+ if errt != nil {
+ t.Fatalf("bad err value")
+ }
+ }
+ if count != 3 {
+ t.Fatalf("different number of errors")
+ }
+
+}