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

plugins: restart killed plugins

Browse Source
This commit is contained in:
bergquist 2017-12-22 15:40:45 +01:00
parent 4aeef32073
commit 05362a9666
3 changed files with 42 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/plugins/backend/log-wrapper.go
View File

@ -11,11 +11,21 @@ type LogWrapper struct {
Logger glog.Logger Logger glog.Logger
} }
func (lw LogWrapper) Trace(msg string, args ...interface{}) {} func (lw LogWrapper) Trace(msg string, args ...interface{}) {
func (lw LogWrapper) Debug(msg string, args ...interface{}) {} glog.Debug2(msg, args...)
func (lw LogWrapper) Info(msg string, args ...interface{}) {} }
func (lw LogWrapper) Warn(msg string, args ...interface{}) {} func (lw LogWrapper) Debug(msg string, args ...interface{}) {
func (lw LogWrapper) Error(msg string, args ...interface{}) {} glog.Debug2(msg, args...)
}
func (lw LogWrapper) Info(msg string, args ...interface{}) {
glog.Info2(msg, args...)
}
func (lw LogWrapper) Warn(msg string, args ...interface{}) {
glog.Warn2(msg, args...)
}
func (lw LogWrapper) Error(msg string, args ...interface{}) {
glog.Error2(msg, args...)
}
func (lw LogWrapper) IsTrace() bool { return true } func (lw LogWrapper) IsTrace() bool { return true }
func (lw LogWrapper) IsDebug() bool { return true } func (lw LogWrapper) IsDebug() bool { return true }

26
pkg/plugins/datasource_plugin.go
View File

@ -9,6 +9,7 @@ import (
"path/filepath" "path/filepath"
"runtime" "runtime"
"strings" "strings"
"time"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/log"
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
@ -71,6 +72,13 @@ func buildExecutablePath(pluginDir, executable, os, arch string) string {
func (p *DataSourcePlugin) initBackendPlugin(log log.Logger) error { func (p *DataSourcePlugin) initBackendPlugin(log log.Logger) error {
p.log = log.New("plugin-id", p.Id) p.log = log.New("plugin-id", p.Id)
p.spawnSubProcess()
go p.reattachKilledProcess()
return nil
}
func (p *DataSourcePlugin) spawnSubProcess() error {
cmd := buildExecutablePath(p.PluginDir, p.Executable, runtime.GOOS, runtime.GOARCH) cmd := buildExecutablePath(p.PluginDir, p.Executable, runtime.GOOS, runtime.GOARCH)
p.client = plugin.NewClient(&plugin.ClientConfig{ p.client = plugin.NewClient(&plugin.ClientConfig{
@ -94,12 +102,28 @@ func (p *DataSourcePlugin) initBackendPlugin(log log.Logger) error {
plugin := raw.(shared.TsdbPlugin) plugin := raw.(shared.TsdbPlugin)
tsdb.RegisterTsdbQueryEndpoint(p.Id, func(dsInfo *models.DataSource) (tsdb.TsdbQueryEndpoint, error) { tsdb.RegisterTsdbQueryEndpoint(p.Id, func(dsInfo *models.DataSource) (tsdb.TsdbQueryEndpoint, error) {
return &shared.TsdbWrapper{TsdbPlugin: plugin}, nil return &shared.DatasourcePluginWrapper{TsdbPlugin: plugin}, nil
}) })
return nil return nil
} }
func (p *DataSourcePlugin) reattachKilledProcess() {
ticker := time.NewTicker(time.Second * 1)
for {
select {
case <-ticker.C:
if p.client.Exited() {
err := p.spawnSubProcess()
if err != nil {
p.log.Error("Failed to spawn subprocess")
}
}
}
}
}
func (p *DataSourcePlugin) Kill() { func (p *DataSourcePlugin) Kill() {
if p.client != nil { if p.client != nil {
p.client.Kill() p.client.Kill()

4
pkg/tsdb/models/proxy/wrapper.go → pkg/tsdb/models/proxy/datasource_plugin_wrapper.go
View File

@ -9,11 +9,11 @@ import (
"golang.org/x/net/context" "golang.org/x/net/context"
) )
type TsdbWrapper struct { type DatasourcePluginWrapper struct {
TsdbPlugin TsdbPlugin
} }
func (tw *TsdbWrapper) Query(ctx context.Context, ds *models.DataSource, query *tsdb.TsdbQuery) (*tsdb.Response, error) { func (tw *DatasourcePluginWrapper) Query(ctx context.Context, ds *models.DataSource, query *tsdb.TsdbQuery) (*tsdb.Response, error) {
jsonData, err := ds.JsonData.MarshalJSON() jsonData, err := ds.JsonData.MarshalJSON()
if err != nil { if err != nil {
return nil, err return nil, err