IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into alerting_opentsdb

Browse Source
This commit is contained in:
bergquist
2016-10-19 13:15:22 +02:00
parent 5fbab038e8 a826591eed
commit 2df8c649b7
41 changed files with 1029 additions and 829 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/cmd/grafana-server/main.go
View File

@@ -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 {