add hclog wrapper for grafanas logger in plugins

2017-12-07 16:33:36 +01:00
parent 0f6c470e03
commit 3f5daa5e58
7 changed files with 98 additions and 29 deletions
@@ -68,13 +68,12 @@ func (g *GrafanaServerImpl) Start() {
 	login.Init()
 	social.NewOAuthService()
 	plugins.Init()
-	client, err := tsdbplugins.Init()
-	defer client.Kill()
-
+	pluginClient, err := tsdbplugins.Init()
 	if err != nil {
 		g.log.Error("failed to start plugins", "error", err)
 		g.Shutdown(1, "Startup failed")
 	}
+	defer pluginClient.Kill()

 	if err := provisioning.Init(g.context, setting.HomePath, setting.Cfg); err != nil {
 		logger.Error("Failed to provision Grafana from config", "error", err)