Skip to content

Commit

Permalink
Use pointer as logger
Browse files Browse the repository at this point in the history
  • Loading branch information
nownabe committed Nov 10, 2020
1 parent 596e5af commit 2af4219
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
5 changes: 3 additions & 2 deletions bqloader.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,18 @@ type BQLoader interface {
// New build a new Loader.
// TODO: Use zerolog.ConsoleWriter for development.
func New() BQLoader {
l := zerolog.New(os.Stdout).With().Timestamp().Logger().Hook(severityHook{})
return &bqloader{
handlers: []*Handler{},
mu: sync.RWMutex{},
logger: zerolog.New(os.Stdout).With().Timestamp().Logger().Hook(severityHook{}),
logger: &l,
}
}

type bqloader struct {
handlers []*Handler
mu sync.RWMutex
logger zerolog.Logger
logger *zerolog.Logger
}

func (l *bqloader) AddHandler(ctx context.Context, h *Handler) error {
Expand Down
5 changes: 3 additions & 2 deletions event.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,11 @@ func (e *Event) FullPath() string {
return fmt.Sprintf("gs://%s/%s", e.Bucket, e.Name)
}

func (e *Event) logger(l zerolog.Logger) zerolog.Logger {
func (e *Event) logger(l *zerolog.Logger) *zerolog.Logger {
d := zerolog.Dict().
Str("name", e.Name).
Str("bucket", e.Bucket)

return l.With().Dict("event", d).Logger()
logger := l.With().Dict("event", d).Logger()
return &logger
}
6 changes: 3 additions & 3 deletions handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -87,14 +87,14 @@ func (h *Handler) handle(ctx context.Context, e Event) error {
return nil
}

func (h *Handler) logger(l zerolog.Logger) zerolog.Logger {
func (h *Handler) logger(l *zerolog.Logger) *zerolog.Logger {
d := zerolog.Dict().
Str("name", h.Name).
Str("pattern", h.Pattern.String()).
Uint("skipLeadingRows", h.SkipLeadingRows).
Str("project", h.Project).
Str("dataset", h.Dataset).
Str("table", h.Table)

return l.With().Dict("handler", d).Logger()
logger := l.With().Dict("handler", d).Logger()
return &logger
}

0 comments on commit 2af4219

Please sign in to comment.