projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
8460: Merge branch 'master' into 8460-websocket-go
[arvados.git]
/
services
/
ws
/
event.go
diff --git
a/services/ws/event.go
b/services/ws/event.go
index 77acf4496fa7957e13922787606c6da5ef670b3f..fa2a5df1b064c2d1b1bfc59a4cea63d54b471150 100644
(file)
--- a/
services/ws/event.go
+++ b/
services/ws/event.go
@@
-2,7
+2,6
@@
package main
import (
"database/sql"
import (
"database/sql"
- "log"
"sync"
"time"
"sync"
"time"
@@
-23,6
+22,7
@@
type eventSource interface {
type event struct {
LogID uint64
Received time.Time
type event struct {
LogID uint64
Received time.Time
+ Ready time.Time
Serial uint64
db *sql.DB
Serial uint64
db *sql.DB
@@
-51,12
+51,12
@@
func (e *event) Detail() *arvados.Log {
&logRow.CreatedAt,
&propYAML)
if e.err != nil {
&logRow.CreatedAt,
&propYAML)
if e.err != nil {
- log
.Printf("retrieving log row %d: %s", e.LogID, e.err
)
+ log
ger(nil).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 {
- log
.Printf("decoding yaml for log row %d: %s", e.LogID, e.err
)
+ log
ger(nil).WithField("LogID", e.LogID).WithError(e.err).Error("yaml decode failed"
)
return nil
}
e.logRow = &logRow
return nil
}
e.logRow = &logRow