opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-03 05:08:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into alerting_definitions

Browse Source 
Conflicts:
	conf/defaults.ini
	pkg/api/dashboard.go
This commit is contained in:
Torkel Ödegaard
2016-06-06 08:43:01 +02:00
parent 6a49d4ed6b 7cbaf06097
commit f36a44c49a
49 changed files with 5530 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,6 +59,7 @@ func main() {
flag.Parse()
writePIDFile()
initRuntime()
metrics.Init()
search.Init()
login.Init()
@ -71,10 +72,6 @@ func main() {
log.Fatal(3, "Notification service failed to initialize", err)
}
if setting.ReportingEnabled {
go metrics.StartUsageReportLoop()
}
StartServer()
exitChan <- 0
}
@ -92,6 +89,7 @@ func initRuntime() {
log.Info("Starting Grafana")
log.Info("Version: %v, Commit: %v, Build date: %v", setting.BuildVersion, setting.BuildCommit, time.Unix(setting.BuildStamp, 0))
setting.LogConfigurationInfo()
sqlstore.NewEngine()
@ -120,9 +118,7 @@ func listenToSystemSignels() {
signalChan := make(chan os.Signal, 1)
code := 0
signal.Notify(signalChan, os.Interrupt)
signal.Notify(signalChan, os.Kill)
signal.Notify(signalChan, syscall.SIGTERM)
signal.Notify(signalChan, os.Interrupt, os.Kill, syscall.SIGTERM)
select {
case sig := <-signalChan: