medsky radical trim of bigsky (relay)

atproto/identity/cache_directory.go

@@ -11,6 +11,7 @@ import (
 	"github.com/hashicorp/golang-lru/v2/expirable"
 )
 
+// CacheDirectory is an implementation of identity.Directory with local cache of Handle and DID
 type CacheDirectory struct {
 	Inner             Directory
 	ErrTTL            time.Duration

bgs/bgs.go

@@ -178,6 +178,7 @@ func NewBGS(db *gorm.DB, ix *indexer.Indexer, repoman *repomgr.RepoManager, evtm
 	slOpts.DefaultRepoLimit = config.DefaultRepoLimit
 	slOpts.ConcurrencyPerPDS = config.ConcurrencyPerPDS
 	slOpts.MaxQueuePerPDS = config.MaxQueuePerPDS
+	slOpts.Logger = bgs.log
 	s, err := NewSlurper(db, bgs.handleFedEvent, slOpts)
 	if err != nil {
 		return nil, err

bgs/fedmgr.go

@@ -56,6 +56,8 @@ type Slurper struct {
 	shutdownResult chan []error
 
 	ssl bool
+
+	log *slog.Logger
 }
 
 type Limiters struct {
@@ -73,6 +75,7 @@ type SlurperOptions struct {
 	DefaultRepoLimit      int64
 	ConcurrencyPerPDS     int64
 	MaxQueuePerPDS        int64
+	Logger                *slog.Logger
 }
 
 func DefaultSlurperOptions() *SlurperOptions {
@@ -85,6 +88,7 @@ func DefaultSlurperOptions() *SlurperOptions {
 		DefaultRepoLimit:      100,
 		ConcurrencyPerPDS:     100,
 		MaxQueuePerPDS:        1_000,
+		Logger:                slog.Default(),
 	}
 }
 
@@ -115,6 +119,7 @@ func NewSlurper(db *gorm.DB, cb IndexCallback, opts *SlurperOptions) (*Slurper,
 		ssl:                   opts.SSL,
 		shutdownChan:          make(chan bool),
 		shutdownResult:        make(chan []error),
+		log:                   opts.Logger,
 	}
 	if err := s.loadConfig(); err != nil {
 		return nil, err

cmd/bigsky/main.go

@@ -310,7 +310,7 @@ func runBigsky(cctx *cli.Context) error {
 	signals := make(chan os.Signal, 1)
 	signal.Notify(signals, syscall.SIGINT, syscall.SIGTERM)
 
-	_, err := cliutil.SetupSlog(cliutil.LogOptions{})
+	_, _, err := cliutil.SetupSlog(cliutil.LogOptions{})
 	if err != nil {
 		return err
 	}

cmd/goat/firehose.go

@@ -79,18 +79,19 @@ func runFirehose(cctx *cli.Context) error {
 	}
 
 	relayHost := cctx.String("relay-host")
-	cursor := cctx.Int("cursor")
 
 	dialer := websocket.DefaultDialer
 	u, err := url.Parse(relayHost)
 	if err != nil {
 		return fmt.Errorf("invalid relayHost URI: %w", err)
 	}
 	u.Path = "xrpc/com.atproto.sync.subscribeRepos"
-	if cursor != 0 {
-		u.RawQuery = fmt.Sprintf("cursor=%d", cursor)
+	if cctx.IsSet("cursor") {
+		u.RawQuery = fmt.Sprintf("cursor=%d", cctx.Int("cursor"))
 	}
-	con, _, err := dialer.Dial(u.String(), http.Header{
+	urlString := u.String()
+	slog.Debug("GET", "url", urlString)
+	con, _, err := dialer.Dial(urlString, http.Header{
 		"User-Agent": []string{fmt.Sprintf("goat/%s", versioninfo.Short())},
 	})
 	if err != nil {

cmd/gosky/main.go

@@ -81,7 +81,7 @@ func run(args []string) {
 		},
 	}
 
-	_, err := cliutil.SetupSlog(cliutil.LogOptions{})
+	_, _, err := cliutil.SetupSlog(cliutil.LogOptions{})
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "logging setup error: %s\n", err.Error())
 		os.Exit(1)