v1.27.0-a #10

Closed
jonathanface wants to merge 473 commits from v1.27.0-a into master
3 changed files with 11 additions and 10 deletions
Showing only changes of commit a478b734fd - Show all commits

View File

@ -106,10 +106,6 @@ const (
) )
func (deps *Deps) PopulateRemainingDeps(ctx context.Context, cctx *cli.Context, makeRepo bool) error { func (deps *Deps) PopulateRemainingDeps(ctx context.Context, cctx *cli.Context, makeRepo bool) error {
if deps == nil {
*deps = Deps{}
}
var err error var err error
if makeRepo { if makeRepo {
// Open repo // Open repo
@ -242,6 +238,7 @@ Get it with: jq .PrivateKey ~/.lotus-miner/keystore/MF2XI2BNNJ3XILLQOJUXMYLUMU`,
deps.Maddrs = append(deps.Maddrs, dtypes.MinerAddress(addr)) deps.Maddrs = append(deps.Maddrs, dtypes.MinerAddress(addr))
} }
} }
fmt.Println("last line of populate")
return nil return nil
} }

View File

@ -5,7 +5,7 @@ import (
"fmt" "fmt"
"os" "os"
"os/signal" "os/signal"
"runtime/debug" "runtime/pprof"
"syscall" "syscall"
"github.com/fatih/color" "github.com/fatih/color"
@ -29,8 +29,8 @@ func SetupCloseHandler() {
go func() { go func() {
<-c <-c
fmt.Println("\r- Ctrl+C pressed in Terminal") fmt.Println("\r- Ctrl+C pressed in Terminal")
debug.PrintStack() pprof.Lookup("goroutine").WriteTo(os.Stdout, 1)
os.Exit(1) panic(1)
}() }()
} }

View File

@ -113,14 +113,18 @@ var runCmd = &cli.Command{
} }
} }
var deps deps.Deps fmt.Println("before populateRemainingDeps")
err = deps.PopulateRemainingDeps(ctx, cctx, true) dependencies := &deps.Deps{}
err = dependencies.PopulateRemainingDeps(ctx, cctx, true)
fmt.Println("after popdeps")
if err != nil { if err != nil {
fmt.Println("err", err)
return err return err
} }
dependencies := &deps fmt.Println("ef")
taskEngine, err := tasks.StartTasks(ctx, dependencies) taskEngine, err := tasks.StartTasks(ctx, dependencies)
fmt.Println("gh")
if err != nil { if err != nil {
return nil return nil