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 09c9d0f0a4ed3b88a221d45fc5e267d41ca4dcee..fa2a5df1b064c2d1b1bfc59a4cea63d54b471150 100644 (file)
--- a/services/ws/event.go
+++ b/services/ws/event.go
@@ -2,7 +2,6 @@ package main
 
 import (
        "database/sql"
-       "log"
        "sync"
        "time"
 
@@ -17,11 +16,13 @@ type eventSink interface {
 
 type eventSource interface {
        NewSink() eventSink
+       DB() *sql.DB
 }
 
 type event struct {
        LogID    uint64
        Received time.Time
+       Ready    time.Time
        Serial   uint64
 
        db     *sql.DB
@@ -50,12 +51,12 @@ func (e *event) Detail() *arvados.Log {
                &logRow.CreatedAt,
                &propYAML)
        if e.err != nil {
-               log.Printf("retrieving log row %d: %s", e.LogID, e.err)
+               logger(nil).WithField("LogID", e.LogID).WithError(e.err).Error("QueryRow failed")
                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)
+               logger(nil).WithField("LogID", e.LogID).WithError(e.err).Error("yaml decode failed")
                return nil
        }
        e.logRow = &logRow