X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/8051c3a14d40f0d410e4ddf54d89a084475d807e..10397a28667ac68a174c916124a80c04fb16062c:/services/ws/event.go diff --git a/services/ws/event.go b/services/ws/event.go index fd280aebb9..c989c0ca55 100644 --- a/services/ws/event.go +++ b/services/ws/event.go @@ -1,12 +1,17 @@ -package main +// Copyright (C) The Arvados Authors. All rights reserved. +// +// SPDX-License-Identifier: AGPL-3.0 + +package ws import ( "database/sql" "sync" "time" - "git.curoverse.com/arvados.git/sdk/go/arvados" + "git.arvados.org/arvados.git/sdk/go/arvados" "github.com/ghodss/yaml" + "github.com/sirupsen/logrus" ) type eventSink interface { @@ -27,6 +32,7 @@ type event struct { Serial uint64 db *sql.DB + logger logrus.FieldLogger logRow *arvados.Log err error mtx sync.Mutex @@ -53,12 +59,12 @@ func (e *event) Detail() *arvados.Log { &logRow.CreatedAt, &propYAML) if e.err != nil { - logger(nil).WithField("LogID", e.LogID).WithError(e.err).Error("QueryRow failed") + e.logger.WithField("LogID", e.LogID).WithError(e.err).Error("QueryRow failed") return nil } e.err = yaml.Unmarshal(propYAML, &logRow.Properties) if e.err != nil { - logger(nil).WithField("LogID", e.LogID).WithError(e.err).Error("yaml decode failed") + e.logger.WithField("LogID", e.LogID).WithError(e.err).Error("yaml decode failed") return nil } e.logRow = &logRow