Merge pull request kubernetes#253 from vmarmol/shutdown

Also handle SIGTERM.
vishh · Sep 23, 2014 · 9f3c99f · 9f3c99f
2 parents 932d2a6 + 6393bfb
commit 9f3c99f
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/cadvisor.go b/cadvisor.go
@@ -22,6 +22,7 @@ import (
 	"os"
 	"os/signal"
 	"runtime"
+	"syscall"
 
 	"github.com/golang/glog"
 	"github.com/google/cadvisor/api"
@@ -128,7 +129,7 @@ func setMaxProcs() {
 
 func installSignalHandler(containerManager manager.Manager) {
 	c := make(chan os.Signal, 1)
-	signal.Notify(c, os.Interrupt, os.Kill)
+	signal.Notify(c, os.Interrupt, os.Kill, syscall.SIGTERM)
 
 	// Block until a signal is received.
 	go func() {