projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
20930: Concurrency optimization.
[arvados.git]
/
services
/
ws
/
event.go
diff --git
a/services/ws/event.go
b/services/ws/event.go
index fd280aebb91aab14700d1ef93395e9ca31becfbd..8b6a2e81bbccafb75f0b7c3f70e362dc027a2b5d 100644
(file)
--- 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"
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/ghodss/yaml"
+ "github.com/sirupsen/logrus"
)
type eventSink interface {
)
type eventSink interface {
@@
-21,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
@@
-53,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