back round 0 view raw

jetstream: configure logging dids added to in-memory filter #225

merged

opened by

anirudh.fi 6 months ago targeting master from push-yuwoytzsmkvm

Signed-off-by: Anirudh Oppiliappan anirudh@tangled.sh

options

unified split

Changed files

+10 -2

appview

state

state.go

jetstream

jetstream.go

knotserver

config

config.go

server.go

appview/state/state.go

···

       95
       95
        
       		slog.Default(),

     

       96
       96
        
       		wrapper,

     

       97
       97
        
       		false,

     

       98
       98
       +
       

     

       99
       99
       +
       		// in-memory filter is inapplicalble to appview so

     

       100
       100
       +
       		// we'll never log dids anyway.

     

       101
       101
       +
       		false,

     

       98
       102
        
       	)

     

       99
       103
        
       	if err != nil {

     

       100
       104
        
       		return nil, fmt.Errorf("failed to create jetstream client: %w", err)

+4 -1

jetstream/jetstream.go

···

       29
       29
        
       	ident  string

     

       30
       30
        
       	l      *slog.Logger

     

       31
       31
        
       

     

       32
       32
       +
       	logDids    bool

     

       32
       33
        
       	wantedDids Set[string]

     

       33
       34
        
       	db         DB

     

       34
       35
        
       	waitForDid bool

     
···

       67
       68
        
       	}

     

       68
       69
        
       }

     

       69
       70
        
       

     

       70
       70
       -
       func NewJetstreamClient(endpoint, ident string, collections []string, cfg *client.ClientConfig, logger *slog.Logger, db DB, waitForDid bool) (*JetstreamClient, error) {

     

       71
       71
       +
       func NewJetstreamClient(endpoint, ident string, collections []string, cfg *client.ClientConfig, logger *slog.Logger, db DB, waitForDid, logDids bool) (*JetstreamClient, error) {

     

       71
       72
        
       	if cfg == nil {

     

       72
       73
        
       		cfg = client.DefaultClientConfig()

     

       73
       74
        
       		cfg.WebsocketURL = endpoint

     
···

       81
       82
        
       		l:          logger,

     

       82
       83
        
       		wantedDids: make(map[string]struct{}),

     

       83
       84
        
       

     

       85
       85
       +
       		logDids: logDids,

     

       86
       86
       +
       

     

       84
       87
        
       		// This will make the goroutine in StartJetstream wait until

     

       85
       88
        
       		// j.wantedDids has been populated, typically using addDids.

     

       86
       89
        
       		waitForDid: waitForDid,

knotserver/config/config.go

···

       19
       19
        
       	DBPath             string `env:"DB_PATH, default=knotserver.db"`

     

       20
       20
        
       	Hostname           string `env:"HOSTNAME, required"`

     

       21
       21
        
       	JetstreamEndpoint  string `env:"JETSTREAM_ENDPOINT, default=wss://jetstream1.us-west.bsky.network/subscribe"`

     

       22
       22
       +
       	LogDids            bool   `env:"LOG_DIDS, default=true"`

     

       22
       23
        
       

     

       23
       24
        
       	// This disables signature verification so use with caution.

     

       24
       25
        
       	Dev bool `env:"DEV, default=false"`

+1 -1

knotserver/server.go

···

       75
       75
        
       	jc, err := jetstream.NewJetstreamClient(c.Server.JetstreamEndpoint, "knotserver", []string{

     

       76
       76
        
       		tangled.PublicKeyNSID,

     

       77
       77
        
       		tangled.KnotMemberNSID,

     

       78
       78
       -
       	}, nil, logger, db, true)

     

       78
       78
       +
       	}, nil, logger, db, true, c.Server.LogDids)

     

       79
       79
        
       	if err != nil {

     

       80
       80
        
       		logger.Error("failed to setup jetstream", "error", err)

     

       81
       81
        
       	}