Fix lint of files in ./contrib/log/fluent (#1432)

* fix(transport/http):fix nil problem

* fix(contrib/log/fluent):part of #1430,fix ./contrib/log/fluent
pull/1434/head
Casper-Mars 3 years ago committed by GitHub
parent 8823a1c618
commit 3f51a15949
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 32
      contrib/log/fluent/fluent.go
  2. 2
      contrib/log/fluent/fluent_test.go
  3. 1
      hack/.lintcheck_failures

@ -102,30 +102,30 @@ type Logger struct {
// tcp://127.0.0.1:24224
// unix://var/run/fluent/fluent.sock
func NewLogger(addr string, opts ...Option) (*Logger, error) {
options := options{}
option := options{}
for _, o := range opts {
o(&options)
o(&option)
}
u, err := url.Parse(addr)
if err != nil {
return nil, err
}
c := fluent.Config{
Timeout: options.timeout,
WriteTimeout: options.writeTimeout,
BufferLimit: options.bufferLimit,
RetryWait: options.retryWait,
MaxRetry: options.maxRetry,
MaxRetryWait: options.maxRetryWait,
TagPrefix: options.tagPrefix,
Async: options.async,
ForceStopAsyncSend: options.forceStopAsyncSend,
Timeout: option.timeout,
WriteTimeout: option.writeTimeout,
BufferLimit: option.bufferLimit,
RetryWait: option.retryWait,
MaxRetry: option.maxRetry,
MaxRetryWait: option.maxRetryWait,
TagPrefix: option.tagPrefix,
Async: option.async,
ForceStopAsyncSend: option.forceStopAsyncSend,
}
switch u.Scheme {
case "tcp":
host, port, err := net.SplitHostPort(u.Host)
if err != nil {
return nil, err
host, port, err2 := net.SplitHostPort(u.Host)
if err2 != nil {
return nil, err2
}
if c.FluentPort, err = strconv.Atoi(port); err != nil {
return nil, err
@ -143,7 +143,7 @@ func NewLogger(addr string, opts ...Option) (*Logger, error) {
return nil, err
}
return &Logger{
opts: options,
opts: option,
log: fl,
}, nil
}
@ -172,4 +172,4 @@ func (l *Logger) Log(level log.Level, keyvals ...interface{}) error {
// Close close the logger.
func (l *Logger) Close() error {
return l.log.Close()
}
}

@ -115,4 +115,4 @@ func BenchmarkLoggerHelperInfow(b *testing.B) {
h.Infow("log", "test")
}
})
}
}

@ -11,4 +11,3 @@
./contrib/registry/kubernetes
./contrib/registry/zookeeper
./contrib/registry/etcd
./contrib/log/fluent

Loading…
Cancel
Save