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

supports windows compatible plugin binaries

Browse Source
This commit is contained in:
bergquist
2018-01-10 15:07:04 +01:00
parent ebd8677607
commit 1fd40a48d9
2 changed files with 40 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/plugins/datasource_plugin.go
View File

@ -65,8 +65,14 @@ var handshakeConfig = plugin.HandshakeConfig{
MagicCookieValue: "datasource",
}
func buildExecutablePath(pluginDir, executable, os, arch string) string {
return path.Join(pluginDir, fmt.Sprintf("%s_%s_%s", executable, strings.ToLower(os), strings.ToLower(arch)))
func composeBinaryName(executable, os, arch string) string {
var extension string
os = strings.ToLower(os)
if os == "windows" {
extension = ".exe"
}
return fmt.Sprintf("%s_%s_%s%s", executable, os, strings.ToLower(arch), extension)
}
func (p *DataSourcePlugin) initBackendPlugin(ctx context.Context, log log.Logger) error {
@ -81,12 +87,13 @@ func (p *DataSourcePlugin) initBackendPlugin(ctx context.Context, log log.Logger
}
func (p *DataSourcePlugin) spawnSubProcess() error {
cmd := buildExecutablePath(p.PluginDir, p.Executable, runtime.GOOS, runtime.GOARCH)
cmd := composeBinaryName(p.Executable, runtime.GOOS, runtime.GOARCH)
fullpath := path.Join(p.PluginDir, cmd)
p.client = plugin.NewClient(&plugin.ClientConfig{
HandshakeConfig: handshakeConfig,
Plugins: map[string]plugin.Plugin{p.Id: &shared.TsdbPluginImpl{}},
Cmd: exec.Command(cmd),
Cmd: exec.Command(fullpath),
AllowedProtocols: []plugin.Protocol{plugin.ProtocolGRPC},
Logger: LogWrapper{Logger: p.log},
})