diff --git a/bqloader.go b/bqloader.go index 5f0a70bc..8108db70 100644 --- a/bqloader.go +++ b/bqloader.go @@ -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 { diff --git a/event.go b/event.go index f9d8db04..cea1e9e7 100644 --- a/event.go +++ b/event.go @@ -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 } diff --git a/handler.go b/handler.go index 78eaa41a..30ad3cab 100644 --- a/handler.go +++ b/handler.go @@ -87,7 +87,7 @@ 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()). @@ -95,6 +95,6 @@ func (h *Handler) logger(l zerolog.Logger) zerolog.Logger { 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 }