8460: Refactor "old events / other messages" mechanism to use the outgoing message...

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

diff --git a/services/ws/pg.go b/services/ws/pg.go
index e766f6c6b966b7a666fb9b53ffe9424b7f6dda3a..206cfeb73bce075ded3b7cf30d8b2363a7e418b8 100644 (file)
--- a/services/ws/pg.go
+++ b/services/ws/pg.go
@@ -2,7 +2,6 @@ package main
 
 import (
        "database/sql"
-       "log"
        "strconv"
        "strings"
        "sync"
@@ -30,42 +29,47 @@ type pgEventSource struct {
        DataSource string
        QueueSize  int
 
+       db         *sql.DB
        pqListener *pq.Listener
        sinks      map[*pgEventSink]bool
        setupOnce  sync.Once
        mtx        sync.Mutex
+       shutdown   chan error
 }
 
 func (ps *pgEventSource) setup() {
+       ps.shutdown = make(chan error, 1)
        ps.sinks = make(map[*pgEventSink]bool)
-       go ps.run()
-}
 
-func (ps *pgEventSource) run() {
        db, err := sql.Open("postgres", ps.DataSource)
        if err != nil {
-               log.Fatalf("sql.Open: %s", err)
+               logger(nil).WithError(err).Fatal("sql.Open failed")
        }
        if err = db.Ping(); err != nil {
-               log.Fatalf("db.Ping: %s", err)
+               logger(nil).WithError(err).Fatal("db.Ping failed")
        }
+       ps.db = db
 
-       listener := pq.NewListener(ps.DataSource, time.Second, time.Minute, func(ev pq.ListenerEventType, err error) {
+       ps.pqListener = pq.NewListener(ps.DataSource, time.Second, time.Minute, func(ev pq.ListenerEventType, err error) {
                if err != nil {
                        // Until we have a mechanism for catching up
                        // on missed events, we cannot recover from a
                        // dropped connection without breaking our
                        // promises to clients.
-                       log.Fatalf("pgEventSource listener problem: %s", err)
+                       logger(nil).WithError(err).Error("listener problem")
+                       ps.shutdown <- err
                }
        })
-       err = listener.Listen("logs")
+       err = ps.pqListener.Listen("logs")
        if err != nil {
-               log.Fatal(err)
+               logger(nil).WithError(err).Fatal("pq Listen failed")
        }
+       logger(nil).Debug("pgEventSource listening")
 
-       debugLogf("pgEventSource listening")
+       go ps.run()
+}
 
+func (ps *pgEventSource) run() {
        eventQueue := make(chan *event, ps.QueueSize)
 
        go func() {
@@ -76,7 +80,12 @@ func (ps *pgEventSource) run() {
                        // concurrent queries would be bounded by
                        // client_count X client_queue_size.
                        e.Detail()
-                       debugLogf("event %d detail %+v", e.Serial, e.Detail())
+
+                       logger(nil).
+                               WithField("serial", e.Serial).
+                               WithField("detail", e.Detail()).
+                               Debug("event ready")
+
                        ps.mtx.Lock()
                        for sink := range ps.sinks {
                                sink.channel <- e
@@ -90,11 +99,18 @@ func (ps *pgEventSource) run() {
        defer ticker.Stop()
        for {
                select {
+               case err, ok := <-ps.shutdown:
+                       if ok {
+                               logger(nil).WithError(err).Info("shutdown")
+                       }
+                       close(eventQueue)
+                       return
+
                case <-ticker.C:
-                       debugLogf("pgEventSource listener ping")
-                       listener.Ping()
+                       logger(nil).Debug("listener ping")
+                       ps.pqListener.Ping()
 
-               case pqEvent, ok := <-listener.Notify:
+               case pqEvent, ok := <-ps.pqListener.Notify:
                        if !ok {
                                close(eventQueue)
                                return
@@ -104,7 +120,7 @@ func (ps *pgEventSource) run() {
                        }
                        logID, err := strconv.ParseUint(pqEvent.Extra, 10, 64)
                        if err != nil {
-                               log.Printf("bad notify payload: %+v", pqEvent)
+                               logger(nil).WithField("pqEvent", pqEvent).Error("bad notify payload")
                                continue
                        }
                        serial++
@@ -112,9 +128,9 @@ func (ps *pgEventSource) run() {
                                LogID:    logID,
                                Received: time.Now(),
                                Serial:   serial,
-                               db:       db,
+                               db:       ps.db,
                        }
-                       debugLogf("event %d %+v", e.Serial, e)
+                       logger(nil).WithField("event", e).Debug("incoming")
                        eventQueue <- e
                        go e.Detail()
                }
@@ -140,6 +156,11 @@ func (ps *pgEventSource) NewSink() eventSink {
        return sink
 }
 
+func (ps *pgEventSource) DB() *sql.DB {
+       ps.setupOnce.Do(ps.setup)
+       return ps.db
+}
+
 type pgEventSink struct {
        channel chan *event
        source  *pgEventSource