Merge branch 'master' into alerting_opentsdb

2016-10-19 13:15:22 +02:00
parent 5fbab038e8 a826591eed
commit 2df8c649b7
41 changed files with 1029 additions and 829 deletions
@@ -103,8 +103,10 @@ func writePIDFile() {

 func listenToSystemSignals(server models.GrafanaServer) {
 	signalChan := make(chan os.Signal, 1)
+	ignoreChan := make(chan os.Signal, 1)
 	code := 0

+	signal.Notify(ignoreChan, syscall.SIGHUP)
 	signal.Notify(signalChan, os.Interrupt, os.Kill, syscall.SIGTERM)

 	select {