Merge branch '11629-groups-contents-memory'

[arvados.git] / services / ws / event.go

diff --git a/services/ws/event.go b/services/ws/event.go
index b6dda4968b83c3bd363d53a9bd18bbf80ed5c979..304f86bbd0583146c4f88a4499d98d872bdab8ea 100644 (file)
--- a/services/ws/event.go
+++ b/services/ws/event.go
@@ -2,11 +2,11 @@ package main
 
 import (
        "database/sql"
-       "log"
        "sync"
        "time"
 
        "git.curoverse.com/arvados.git/sdk/go/arvados"
+       "github.com/ghodss/yaml"
 )
 
 type eventSink interface {
@@ -15,12 +15,14 @@ type eventSink interface {
 }
 
 type eventSource interface {
-       NewSink(chan *event) eventSink
+       NewSink() eventSink
+       DB() *sql.DB
 }
 
 type event struct {
-       LogUUID  string
+       LogID    uint64
        Received time.Time
+       Ready    time.Time
        Serial   uint64
 
        db     *sql.DB
@@ -39,18 +41,25 @@ func (e *event) Detail() *arvados.Log {
                return e.logRow
        }
        var logRow arvados.Log
-       var oldAttrs, newAttrs []byte
-       e.err = e.db.QueryRow(`SELECT id, uuid, object_uuid, object_owner_uuid, event_type, created_at, old_attributes, new_attributes FROM logs WHERE uuid = ?`, e.LogUUID).Scan(
+       var propYAML []byte
+       e.err = e.db.QueryRow(`SELECT id, uuid, object_uuid, COALESCE(object_owner_uuid,''), COALESCE(event_type,''), event_at, created_at, properties FROM logs WHERE id = $1`, e.LogID).Scan(
                &logRow.ID,
                &logRow.UUID,
                &logRow.ObjectUUID,
                &logRow.ObjectOwnerUUID,
                &logRow.EventType,
+               &logRow.EventAt,
                &logRow.CreatedAt,
-               &oldAttrs,
-               &newAttrs)
+               &propYAML)
        if e.err != nil {
-               log.Printf("retrieving log row %s: %s", e.LogUUID, 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 {
+               logger(nil).WithField("LogID", e.LogID).WithError(e.err).Error("yaml decode failed")
+               return nil
+       }
+       e.logRow = &logRow
        return e.logRow
 }