Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/merge/grpc' into merge/grpc
Browse files Browse the repository at this point in the history
  • Loading branch information
LaurenceLiZhixin committed Mar 16, 2022
2 parents 339553a + 7dda6a1 commit 17b9fb2
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ release
*.zip
*.tar.gz
*.rar
vendor

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
8 changes: 4 additions & 4 deletions pkg/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package config

import (
"github.com/dubbogo/triple/pkg/common/constant"
loggerInteface "github.com/dubbogo/triple/pkg/common/logger"
loggerInterface "github.com/dubbogo/triple/pkg/common/logger"
"github.com/dubbogo/triple/pkg/common/logger/default_logger"
)

Expand Down Expand Up @@ -52,7 +52,7 @@ type Option struct {
JaegerUseAgent bool

// logger
Logger loggerInteface.Logger
Logger loggerInterface.Logger

// NumWorkers is num of gr in ConnectionPool
NumWorkers uint32
Expand Down Expand Up @@ -156,9 +156,9 @@ func WithHeaderGroup(group string) OptionFunction {

// WithLogger return OptionFunction with target @logger, which must impl triple/pkg/common/logger.Logger
// the input @logger should be AddCallerSkip(1)
func WithLogger(logger loggerInteface.Logger) OptionFunction {
func WithLogger(logger loggerInterface.Logger) OptionFunction {
return func(o *Option) {
o.Logger = loggerInteface.NewLoggerWrapper(logger)
o.Logger = loggerInterface.NewLoggerWrapper(logger)
}
}

Expand Down

0 comments on commit 17b9fb2

Please sign in to comment.