Merge branch 'master' into feature/add_es_alerting

2018-04-09 14:00:28 +08:00
parent 4050fce220 ce787b88bf
commit fbed72c89c
101 changed files with 1841 additions and 918 deletions
@@ -111,7 +111,7 @@ func (g *GrafanaServerImpl) initLogging() {
 	})

 	if err != nil {
-		g.log.Error(err.Error())
+		fmt.Fprintf(os.Stderr, "Failed to start grafana. error: %s\n", err.Error())
 		os.Exit(1)
 	}