Armael/nomad-mirage-plugin
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #9 from hashicorp/b-remove-duplicate-hclog-import

Browse source 
hello: remove duplicate hclog import within driver.
This commit is contained in:
James Rasell 2020-11-23 16:01:58 +01:00 committed by GitHub
commit 5d6fcc4047
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
hello/driver.go
View file

@ -11,7 +11,6 @@ import (
"github.com/hashicorp/consul-template/signals" "github.com/hashicorp/consul-template/signals"
"github.com/hashicorp/go-hclog" "github.com/hashicorp/go-hclog"
log "github.com/hashicorp/go-hclog"
"github.com/hashicorp/nomad/drivers/shared/eventer" "github.com/hashicorp/nomad/drivers/shared/eventer"
"github.com/hashicorp/nomad/drivers/shared/executor" "github.com/hashicorp/nomad/drivers/shared/executor"
"github.com/hashicorp/nomad/plugins/base" "github.com/hashicorp/nomad/plugins/base"
@ -181,11 +180,11 @@ type HelloDriverPlugin struct {
signalShutdown context.CancelFunc signalShutdown context.CancelFunc
// logger will log to the Nomad agent // logger will log to the Nomad agent
logger log.Logger logger hclog.Logger
} }
// NewPlugin returns a new example driver plugin // NewPlugin returns a new example driver plugin
func NewPlugin(logger log.Logger) drivers.DriverPlugin { func NewPlugin(logger hclog.Logger) drivers.DriverPlugin {
ctx, cancel := context.WithCancel(context.Background()) ctx, cancel := context.WithCancel(context.Background())
logger = logger.Named(pluginName) logger = logger.Named(pluginName)