mirror of
https://github.com/moby/moby.git
synced 2026-08-13 17:06:44 +00:00
daemon/logger/splunk: rename var that shadowed import
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
@@ -267,7 +267,7 @@ func New(info logger.Info) (logger.Logger, error) {
|
||||
streamChannelSize = getAdvancedOptionInt(envVarStreamChannelSize, defaultStreamChannelSize)
|
||||
)
|
||||
|
||||
logger := &splunkLogger{
|
||||
splLogger := &splunkLogger{
|
||||
client: client,
|
||||
transport: transport,
|
||||
url: splunkURL.String(),
|
||||
@@ -292,7 +292,7 @@ func New(info logger.Info) (logger.Logger, error) {
|
||||
}
|
||||
}
|
||||
if verifyConnection {
|
||||
err = verifySplunkConnection(logger)
|
||||
err = verifySplunkConnection(splLogger)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -321,14 +321,14 @@ func New(info logger.Info) (logger.Logger, error) {
|
||||
Attrs: attrs,
|
||||
}
|
||||
|
||||
loggerWrapper = &splunkLoggerInline{logger, nullEvent}
|
||||
loggerWrapper = &splunkLoggerInline{splLogger, nullEvent}
|
||||
case splunkFormatJSON:
|
||||
nullEvent := &splunkMessageEvent{
|
||||
Tag: tag,
|
||||
Attrs: attrs,
|
||||
}
|
||||
|
||||
loggerWrapper = &splunkLoggerJSON{&splunkLoggerInline{logger, nullEvent}}
|
||||
loggerWrapper = &splunkLoggerJSON{&splunkLoggerInline{splLogger, nullEvent}}
|
||||
case splunkFormatRaw:
|
||||
var prefix bytes.Buffer
|
||||
if tag != "" {
|
||||
@@ -342,7 +342,7 @@ func New(info logger.Info) (logger.Logger, error) {
|
||||
prefix.WriteString(" ")
|
||||
}
|
||||
|
||||
loggerWrapper = &splunkLoggerRaw{logger, prefix.Bytes()}
|
||||
loggerWrapper = &splunkLoggerRaw{splLogger, prefix.Bytes()}
|
||||
default:
|
||||
return nil, fmt.Errorf("Unexpected format %s", splunkFormat)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user