diff options
| -rw-r--r-- | repoNew.go | 2 | ||||
| -rw-r--r-- | rill.go | 11 | ||||
| -rw-r--r-- | scanRepoDir.go | 9 | ||||
| -rw-r--r-- | structs.go | 6 |
4 files changed, 8 insertions, 20 deletions
@@ -171,7 +171,7 @@ func (f *Forge) VerifyBranchNames(repo *gitpb.Repo) { repo.SetUserBranchName(uname) } } - log.Info("VerifyBranchNames", repo.GetMasterBranchName(), repo.GetDevelBranchName(), repo.GetUserBranchName()) + // log.Info("VerifyBranchNames", repo.GetMasterBranchName(), repo.GetDevelBranchName(), repo.GetUserBranchName()) } // what name should be used for the user branch? @@ -115,9 +115,9 @@ func (f *Forge) RillFuncError(rillf func(*gitpb.Repo) error) map[string]*RillSta } func (f *Forge) ConfigRill(rillX int, rillY int) { - f.rillX = rillX - f.rillY = rillY - log.Infof("Setting rill values to %d,%d\n", f.rillX, f.rillY) + f.Config.RillX = int32(rillX) + f.Config.RillY = int32(rillY) + log.Infof("Setting rill values to %d,%d\n", f.Config.RillX, f.Config.RillY) } type RillStats struct { @@ -148,6 +148,7 @@ func (f *Forge) RillRepos(rillf func(*gitpb.Repo) error) map[string]*RillStats { } all = append(all, repo) } + // log.Info("Rill Repos len =", len(all)) // Convert a slice of user IDs into a channel ids := rill.FromSlice(all, nil) @@ -156,11 +157,11 @@ func (f *Forge) RillRepos(rillf func(*gitpb.Repo) error) map[string]*RillStats { // Read users from the API. // Concurrency = 20 - dirs := rill.Map(ids, f.rillX, func(id *gitpb.Repo) (*gitpb.Repo, error) { + dirs := rill.Map(ids, int(f.Config.RillX), func(id *gitpb.Repo) (*gitpb.Repo, error) { return id, nil }) - rill.ForEach(dirs, f.rillY, func(repo *gitpb.Repo) error { + rill.ForEach(dirs, int(f.Config.RillY), func(repo *gitpb.Repo) error { // todo: make this a goroutine to show stats to the user rillMu.Lock() counter += 1 diff --git a/scanRepoDir.go b/scanRepoDir.go index 19de1b0..6459ce0 100644 --- a/scanRepoDir.go +++ b/scanRepoDir.go @@ -1,8 +1,6 @@ package forgepb import ( - "os" - "github.com/destel/rill" "go.wit.com/lib/config" "go.wit.com/lib/protobuf/gitpb" @@ -55,17 +53,12 @@ func (f *Forge) checkNamespace(fullpath string) (*gitpb.Repo, error) { } func (f *Forge) ScanRepoDir() error { - if r := recover(); r != nil { - log.Warn("panic ecovered in", r) - // debug.PrintStack() - // pprof.Lookup("goroutine").WriteTo(os.Stdout, 1) - panic(os.Stdout) - } dirs, err := gitDirectoriesNew(f.Config.ReposDir) if err != nil { return err } + log.Info("doing reload()") stats := f.RillRepos(reloadCheck) for _, stat := range stats { if stat.Err == nil { @@ -14,13 +14,7 @@ type Forge struct { Repos *gitpb.Repos // the repo protobufs Patchsets *Patchsets // patches that are in progress hostname string // your hostname - rillX int // used for Rill() - rillY int // used for Rill() goWork bool // means the user is currently using a go.work file - // goSrc string // the path to go/src - // forgeURL string // URL to use to forge.wit.com - // configDir string // normally ~/.config/forge - // patchDir string // where patches are stored } func (f *Forge) IsGoWork() bool { |