Merge pull request #2016 from jonasrmichel/fix/ipfs-cluster-follow-informers

Enable numpin and pinqueue informers in ipfs-cluster-follow
This commit is contained in:
Hector Sanjuan 2024-01-04 12:41:35 +01:00 committed by GitHub
commit 3a86e1b16e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -19,6 +19,8 @@ import (
"github.com/ipfs-cluster/ipfs-cluster/datastore/badger" "github.com/ipfs-cluster/ipfs-cluster/datastore/badger"
"github.com/ipfs-cluster/ipfs-cluster/datastore/leveldb" "github.com/ipfs-cluster/ipfs-cluster/datastore/leveldb"
"github.com/ipfs-cluster/ipfs-cluster/informer/disk" "github.com/ipfs-cluster/ipfs-cluster/informer/disk"
"github.com/ipfs-cluster/ipfs-cluster/informer/pinqueue"
"github.com/ipfs-cluster/ipfs-cluster/informer/tags"
"github.com/ipfs-cluster/ipfs-cluster/ipfsconn/ipfshttp" "github.com/ipfs-cluster/ipfs-cluster/ipfsconn/ipfshttp"
"github.com/ipfs-cluster/ipfs-cluster/monitor/pubsubmon" "github.com/ipfs-cluster/ipfs-cluster/monitor/pubsubmon"
"github.com/ipfs-cluster/ipfs-cluster/observations" "github.com/ipfs-cluster/ipfs-cluster/observations"
@ -337,10 +339,30 @@ func runCmd(c *cli.Context) error {
return cli.Exit(errors.Wrap(err, "creating IPFS Connector component"), 1) return cli.Exit(errors.Wrap(err, "creating IPFS Connector component"), 1)
} }
informer, err := disk.NewInformer(cfgs.DiskInf) var informers []ipfscluster.Informer
if cfgHelper.Manager().IsLoadedFromJSON(config.Informer, cfgs.DiskInf.ConfigKey()) {
diskInf, err := disk.NewInformer(cfgs.DiskInf)
if err != nil { if err != nil {
return cli.Exit(errors.Wrap(err, "creating disk informer"), 1) return cli.Exit(errors.Wrap(err, "creating disk informer"), 1)
} }
informers = append(informers, diskInf)
}
if cfgHelper.Manager().IsLoadedFromJSON(config.Informer, cfgs.TagsInf.ConfigKey()) {
tagsInf, err := tags.New(cfgs.TagsInf)
if err != nil {
return cli.Exit(errors.Wrap(err, "creating numpin informer"), 1)
}
informers = append(informers, tagsInf)
}
if cfgHelper.Manager().IsLoadedFromJSON(config.Informer, cfgs.PinQueueInf.ConfigKey()) {
pinQueueInf, err := pinqueue.New(cfgs.PinQueueInf)
if err != nil {
return cli.Exit(errors.Wrap(err, "creating pinqueue informer"), 1)
}
informers = append(informers, pinQueueInf)
}
alloc, err := balanced.New(cfgs.BalancedAlloc) alloc, err := balanced.New(cfgs.BalancedAlloc)
if err != nil { if err != nil {
return cli.Exit(errors.Wrap(err, "creating metrics allocator"), 1) return cli.Exit(errors.Wrap(err, "creating metrics allocator"), 1)
@ -402,7 +424,7 @@ func runCmd(c *cli.Context) error {
tracker, tracker,
mon, mon,
alloc, alloc,
[]ipfscluster.Informer{informer}, informers,
tracer, tracer,
) )
if err != nil { if err != nil {