Skip to content

Commit

Permalink
GODRIVER-2572 Update topology options to default load empty log options
Browse files Browse the repository at this point in the history
  • Loading branch information
prestonvasquez committed Aug 15, 2023
1 parent 79894b8 commit 906d534
Showing 1 changed file with 14 additions and 12 deletions.
26 changes: 14 additions & 12 deletions x/mongo/driver/topology/topology_options.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,11 @@ func ConvertToDriverAPIOptions(s *options.ServerAPIOptions) *driver.ServerAPIOpt
return driverOpts
}

func newLogger(opts options.LoggerOptions) (*logger.Logger, error) {
func newLogger(opts *options.LoggerOptions) (*logger.Logger, error) {
if opts == nil {
opts = options.Logger()
}

componentLevels := make(map[logger.Component]logger.Level)
for component, level := range opts.ComponentLevels {
componentLevels[logger.Component(component)] = logger.Level(level)
Expand Down Expand Up @@ -350,19 +354,17 @@ func NewConfig(co *options.ClientOptions, clock *session.ClusterClock) (*Config,
)
}

if opts := co.LoggerOptions; opts != nil {
lgr, err := newLogger(*opts)
if err != nil {
return nil, err
}
lgr, err := newLogger(opts)
if err != nil {
return nil, err
}

serverOpts = append(
serverOpts,
withLogger(func() *logger.Logger { return lgr }),
)
serverOpts = append(
serverOpts,
withLogger(func() *logger.Logger { return lgr }),
)

cfgp.logger = lgr
}
cfgp.logger = lgr

serverOpts = append(
serverOpts,
Expand Down

0 comments on commit 906d534

Please sign in to comment.