projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
21204: Merge branch '21204-stable-log-sort' from arvados-workbench2.git
[arvados.git]
/
services
/
ws
/
event.go
diff --git
a/services/ws/event.go
b/services/ws/event.go
index ae545c092cf8ddece45cfbebdddb542e08de16b4..8b6a2e81bbccafb75f0b7c3f70e362dc027a2b5d 100644
(file)
--- a/
services/ws/event.go
+++ b/
services/ws/event.go
@@
-2,7
+2,7
@@
//
// SPDX-License-Identifier: AGPL-3.0
//
// SPDX-License-Identifier: AGPL-3.0
-package
main
+package
ws
import (
"database/sql"
import (
"database/sql"
@@
-11,6
+11,7
@@
import (
"git.arvados.org/arvados.git/sdk/go/arvados"
"github.com/ghodss/yaml"
"git.arvados.org/arvados.git/sdk/go/arvados"
"github.com/ghodss/yaml"
+ "github.com/sirupsen/logrus"
)
type eventSink interface {
)
type eventSink interface {
@@
-25,12
+26,13
@@
type eventSource interface {
}
type event struct {
}
type event struct {
- LogID
u
int64
+ LogID int64
Received time.Time
Ready time.Time
Serial uint64
db *sql.DB
Received time.Time
Ready time.Time
Serial uint64
db *sql.DB
+ logger logrus.FieldLogger
logRow *arvados.Log
err error
mtx sync.Mutex
logRow *arvados.Log
err error
mtx sync.Mutex
@@
-57,12
+59,12
@@
func (e *event) Detail() *arvados.Log {
&logRow.CreatedAt,
&propYAML)
if e.err != nil {
&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 {
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
return nil
}
e.logRow = &logRow