cerc-io/lotus
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

Use correct ctx for SectorBuilder/Miner

Browse Source
This commit is contained in:
Łukasz Magiera 2019-07-31 19:01:04 +02:00
parent a968eef322
commit 006fbe556f
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
node/modules/core.go
View File

@ -251,14 +251,16 @@ func SectorBuilderConfig(storagePath string) func() (*sectorbuilder.SectorBuilde
} }
} }
func SectorBuilder(lc fx.Lifecycle, sbc *sectorbuilder.SectorBuilderConfig) (*sectorbuilder.SectorBuilder, error) { func SectorBuilder(mctx helpers.MetricsCtx, lc fx.Lifecycle, sbc *sectorbuilder.SectorBuilderConfig) (*sectorbuilder.SectorBuilder, error) {
sb, err := sectorbuilder.New(sbc) sb, err := sectorbuilder.New(sbc)
if err != nil { if err != nil {
return nil, err return nil, err
} }
ctx := helpers.LifecycleCtx(mctx, lc)
lc.Append(fx.Hook{ lc.Append(fx.Hook{
OnStart: func(ctx context.Context) error { OnStart: func(context.Context) error {
sb.Run(ctx) sb.Run(ctx)
return nil return nil
}, },
@ -267,7 +269,7 @@ func SectorBuilder(lc fx.Lifecycle, sbc *sectorbuilder.SectorBuilderConfig) (*se
return sb, nil return sb, nil
} }
func StorageMiner(lc fx.Lifecycle, api api.FullNode, h host.Host, ds datastore.Batching, sb *sectorbuilder.SectorBuilder, w *wallet.Wallet) (*storage.Miner, error) { func StorageMiner(mctx helpers.MetricsCtx, lc fx.Lifecycle, api api.FullNode, h host.Host, ds datastore.Batching, sb *sectorbuilder.SectorBuilder, w *wallet.Wallet) (*storage.Miner, error) {
maddrb, err := ds.Get(datastore.NewKey("miner-address")) maddrb, err := ds.Get(datastore.NewKey("miner-address"))
if err != nil { if err != nil {
return nil, err return nil, err
@ -283,8 +285,10 @@ func StorageMiner(lc fx.Lifecycle, api api.FullNode, h host.Host, ds datastore.B
return nil, err return nil, err
} }
ctx := helpers.LifecycleCtx(mctx, lc)
lc.Append(fx.Hook{ lc.Append(fx.Hook{
OnStart: func(ctx context.Context) error { OnStart: func(context.Context) error {
return sm.Run(ctx) return sm.Run(ctx)
}, },
}) })