commit d89ebf9bba5e756d6ce5c04b5762737f855f8dcc · edavis.dev/monarch

+8 -5

cmd/monarch/backfill.go

···

       1
       1
        
       package main

     

       2
       2
        
       

     

       3
       3
       -
       import "github.com/bluesky-social/indigo/backfill"

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"github.com/bluesky-social/indigo/backfill"

     

       5
       5
       +
       	"github.com/urfave/cli/v2"

     

       6
       6
       +
       )

     

       4
       7
        
       

     

       5
       5
       -
       func NewBackfillService(store backfill.Store, h *HandlerService, workers int, consumers int) *backfill.Backfiller {

     

       8
       8
       +
       func NewBackfillService(store backfill.Store, h *HandlerService, cctx *cli.Context) *backfill.Backfiller {

     

       6
       9
        
       	opts := &backfill.BackfillOptions{

     

       7
       7
       -
       		ParallelBackfills:     workers,

     

       8
       8
       -
       		ParallelRecordCreates: consumers,

     

       10
       10
       +
       		ParallelBackfills:     cctx.Int("backfill-workers"),

     

       11
       11
       +
       		ParallelRecordCreates: cctx.Int("backfill-consumers"),

     

       9
       12
        
       		NSIDFilter:            "",

     

       10
       13
        
       		SyncRequestsPerSecond: 10,

     

       11
       11
       -
       		RelayHost:             "https://bsky.network",

     

       14
       14
       +
       		RelayHost:             "https://" + cctx.String("relay-host"),

     

       12
       15
        
       	}

     

       13
       16
        
       

     

       14
       17
        
       	return backfill.NewBackfiller("backfiller", store, h.HandleCreate, h.HandleUpdate, h.HandleDelete, opts)

+3 -2

cmd/monarch/census.go

···

       7
       7
        
       	"github.com/bluesky-social/indigo/api/atproto"

     

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

     

       9
       9
        
       	"github.com/bluesky-social/indigo/xrpc"

     

       10
       10
       +
       	"github.com/urfave/cli/v2"

     

       10
       11
        
       )

     

       11
       12
        
       

     

       12
       13
        
       type CensusService struct {

     
···

       25
       26
        
       	}

     

       26
       27
        
       }

     

       27
       28
        
       

     

       28
       28
       -
       func (cs *CensusService) Start(ctx context.Context) {

     

       29
       29
       +
       func (cs *CensusService) Start(ctx context.Context, cctx *cli.Context) {

     

       29
       30
        
       	xrpcc := &xrpc.Client{

     

       30
       30
       -
       		Host: "https://bsky.network",

     

       31
       31
       +
       		Host: "https://" + cctx.String("relay-host"),

     

       31
       32
        
       	}

     

       32
       33
        
       

     

       33
       34
        
       	jmstore, ok := cs.backfill.Store.(jobMaker)

+4 -2

cmd/monarch/firehose.go

···

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
        
       	"context"

     

       5
       5
       +
       	"fmt"

     

       5
       6
        
       	"net/http"

     

       6
       7
        
       

     

       7
       8
        
       	"github.com/gorilla/websocket"

     

       9
       9
       +
       	"github.com/urfave/cli/v2"

     

       8
       10
        
       )

     

       9
       11
        
       

     

       10
       10
       -
       func NewFirehoseConnection(ctx context.Context, cursorSvc *CursorService) (*websocket.Conn, error) {

     

       11
       11
       -
       	url := "wss://bsky.network/xrpc/com.atproto.sync.subscribeRepos"

     

       12
       12
       +
       func NewFirehoseConnection(ctx context.Context, cctx *cli.Context, cursorSvc *CursorService) (*websocket.Conn, error) {

     

       13
       13
       +
       	url := fmt.Sprintf("wss://%s/xrpc/com.atproto.sync.subscribeRepos", cctx.String("relay-host"))

     

       12
       14
        
       	curs, _ := cursorSvc.Get("firehose")

     

       13
       15
        
       	if curs != "" {

     

       14
       16
        
       		url += "?cursor=" + curs

+7 -5

cmd/monarch/main.go

···

       46
       46
        
       

     

       47
       47
        
       	app.handler = NewHandlerService(app.content)

     

       48
       48
        
       

     

       49
       49
       -
       	workers := cctx.Int("backfill-workers")

     

       50
       50
       -
       	consumers := cctx.Int("backfill-consumers")

     

       51
       51
       -
       	app.backfill = NewBackfillService(backfill.NewGormstore(app.state), app.handler, workers, consumers)

     

       49
       49
       +
       	app.backfill = NewBackfillService(backfill.NewGormstore(app.state), app.handler, cctx)

     

       52
       50
        
       	go app.backfill.Start()

     

       53
       51
        
       

     

       54
       52
        
       	app.census = NewCensusService(app.cursor, app.backfill)

     

       55
       55
       -
       	go app.census.Start(ctx)

     

       53
       53
       +
       	go app.census.Start(ctx, cctx)

     

       56
       54
        
       

     

       57
       57
       -
       	wsconn, err := NewFirehoseConnection(ctx, app.cursor)

     

       55
       55
       +
       	wsconn, err := NewFirehoseConnection(ctx, cctx, app.cursor)

     

       58
       56
        
       	if err != nil {

     

       59
       57
        
       		return fmt.Errorf("error connecting to relay: %w", err)

     

       60
       58
        
       	}

     
···

       118
       116
        
       		&cli.StringFlag{

     

       119
       117
        
       			Name:  "content-db-url",

     

       120
       118
        
       			Value: "sqlite://./content.db",

     

       119
       119
       +
       		},

     

       120
       120
       +
       		&cli.StringFlag{

     

       121
       121
       +
       			Name:  "relay-host",

     

       122
       122
       +
       			Value: "bsky.network",

     

       121
       123
        
       		},

     

       122
       124
        
       		&cli.IntFlag{

     

       123
       125
        
       			Name:  "max-db-connections",