commit 7040d2a130fff5d7a1b41349125890cd3983f22e · edavis.dev/monarch

-2

cmd/backfiller/backend.go

···

       12
       12
        
       	data  *gorm.DB

     

       13
       13
        
       	bf    *backfill.Backfiller

     

       14
       14
        
       

     

       15
       15
       -
       	backfillComplete bool

     

       16
       16
       -
       

     

       17
       15
        
       	firehoseLk  sync.Mutex

     

       18
       16
        
       	firehoseSeq string

     

       19
       17
        
       	reposLk     sync.Mutex

+2 -17

cmd/backfiller/handlers.go

···

       3
       3
        
       import (

     

       4
       4
        
       	"bytes"

     

       5
       5
        
       	"context"

     

       6
       6
       -
       	"errors"

     

       7
       6
        
       	"fmt"

     

       8
       7
        
       	"log/slog"

     

       9
       8
        
       	"strconv"

     
···

       11
       10
        
       

     

       12
       11
        
       	comatproto "github.com/bluesky-social/indigo/api/atproto"

     

       13
       12
        
       	appbsky "github.com/bluesky-social/indigo/api/bsky"

     

       14
       14
       -
       	"github.com/bluesky-social/indigo/backfill"

     

       15
       13
        
       	"github.com/ipfs/go-cid"

     

       16
       14
        
       )

     

       17
       15
        
       

     
···

       31
       29
        
       	b.firehoseSeq = strconv.Itoa(int(evt.Seq))

     

       32
       30
        
       	b.firehoseLk.Unlock()

     

       33
       31
        
       

     

       34
       34
       -
       	if b.backfillComplete {

     

       35
       35
       -
       		return b.bf.HandleEvent(ctx, evt)

     

       36
       36
       -
       	}

     

       37
       37
       -
       

     

       38
       38
       -
       	job, err := b.bf.Store.GetJob(ctx, evt.Repo)

     

       39
       39
       -
       	if job == nil {

     

       40
       40
       -
       		if errors.Is(err, backfill.ErrJobNotFound) {

     

       41
       41
       -
       			return nil

     

       42
       42
       -
       		} else {

     

       43
       43
       -
       			return fmt.Errorf("error getting job: %w", err)

     

       44
       44
       -
       		}

     

       45
       45
       -
       	} else {

     

       46
       46
       -
       		return b.bf.HandleEvent(ctx, evt)

     

       47
       47
       -
       	}

     

       32
       32
       +
       	return b.bf.HandleEvent(ctx, evt)

     

       48
       33
        
       }

     

       49
       34
        
       

     

       50
       35
        
       type handleOpCreateUpdate func(context.Context, string, string, string, *[]byte, *cid.Cid) error

     
···

       55
       40
        
       		return nil

     

       56
       41
        
       	}

     

       57
       42
        
       

     

       58
       58
       -
       	sl := slog.With("source", "commitHandler")

     

       43
       43
       +
       	sl := slog.With("source", "HandleCreateOp")

     

       59
       44
        
       

     

       60
       45
        
       	var out appbsky.FeedGenerator

     

       61
       46
        
       	if err := out.UnmarshalCBOR(bytes.NewReader(*rec)); err != nil {

-2

cmd/backfiller/pump.go

···

       65
       65
        
       		}

     

       66
       66
        
       	}

     

       67
       67
        
       

     

       68
       68
       -
       	sl.Info("finished listing repos, switching over to event stream")

     

       69
       69
       -
       	b.backfillComplete = true

     

       70
       68
        
       	return nil

     

       71
       69
        
       }