executors: Unify go-plugin handshake

This commit is contained in:
Danielle Tomlinson
2018-11-30 10:59:23 +01:00
parent 756325bcbd
commit 17d14d7f52
3 changed files with 4 additions and 9 deletions

View File

@@ -8,6 +8,7 @@ import (
hclog "github.com/hashicorp/go-hclog"
"github.com/hashicorp/go-plugin"
"github.com/hashicorp/nomad/plugins/base"
"github.com/hashicorp/nomad/plugins/executor"
)
@@ -42,7 +43,7 @@ func (e *ExecutorPluginCommand) Run(args []string) int {
return 1
}
plugin.Serve(&plugin.ServeConfig{
HandshakeConfig: executor.HandshakeConfig,
HandshakeConfig: base.Handshake,
Plugins: executor.GetPluginMap(
stdo,
hclog.LevelFromString(executorConfig.LogLevel),