fix vendoring and log concurrency

This commit is contained in:
golangci 2018-05-27 10:18:35 +03:00
parent c2e7e488e2
commit f96d8ba829
8 changed files with 53 additions and 16 deletions

17
Gopkg.lock generated
View File

@ -130,6 +130,12 @@
packages = ["."]
revision = "7b41b0f84881918dab3c16c5e5148d8aa55d27b4"
[[projects]]
branch = "master"
name = "github.com/golangci/lint"
packages = ["."]
revision = "e1cc50c0cfa0e058f40ced1b3d54b86014440c91"
[[projects]]
branch = "master"
name = "github.com/golangci/maligned"
@ -386,16 +392,9 @@
branch = "master"
name = "mvdan.cc/interfacer"
packages = ["check"]
revision = "72c3fb5d5e5e0ca07e9a7c90bcd150b049920b3b"
revision = "87cc93d81c1c4e460392bd89c6eb500f2c4cf629"
source = "github.com/golangci/interfacer"
[[projects]]
branch = "master"
name = "mvdan.cc/lint"
packages = ["."]
revision = "8ff1696d5934157cea033c4b97cf5ea23fdb7a32"
source = "github.com/golangci/lint"
[[projects]]
branch = "master"
name = "sourcegraph.com/sourcegraph/go-diff"
@ -411,6 +410,6 @@
[solve-meta]
analyzer-name = "dep"
analyzer-version = 1
inputs-digest = "f75bddb805db581bbdc751784b540bc476179ed3d918cac98b870bb8c48a26aa"
inputs-digest = "86deafc3c3aea3a6a1437dbf35545c9d4e1f9b510f5fe21b9ef434a465d377dc"
solver-name = "gps-cdcl"
solver-version = 1

View File

@ -61,11 +61,6 @@
branch = "master"
source = "github.com/golangci/gas"
[[override]]
name = "mvdan.cc/lint"
branch = "master"
source = "github.com/golangci/lint"
[prune]
go-tests = true
unused-packages = true
@ -77,3 +72,43 @@
[[constraint]]
branch = "master"
name = "github.com/mitchellh/go-ps"
[[constraint]]
branch = "master"
name = "github.com/golangci/go-tools"
[[constraint]]
branch = "master"
name = "github.com/golangci/unconvert"
[[constraint]]
branch = "master"
name = "github.com/golangci/go-misc"
[[constraint]]
branch = "master"
name = "github.com/golangci/goconst"
[[constraint]]
branch = "master"
name = "github.com/golangci/check"
[[constraint]]
branch = "master"
name = "github.com/golangci/gocyclo"
[[constraint]]
branch = "master"
name = "github.com/golangci/gofmt"
[[constraint]]
branch = "master"
name = "github.com/golangci/maligned"
[[constraint]]
branch = "master"
name = "github.com/golangci/ineffassign"
[[constraint]]
branch = "master"
name = "github.com/golangci/lint"

View File

@ -292,6 +292,9 @@ func (e *Executor) runAndPrint(ctx context.Context, args []string) error {
}
func (e *Executor) executeRun(cmd *cobra.Command, args []string) {
logrus.Infof("Concurrency: %d, machine cpus count: %d",
e.cfg.Run.Concurrency, runtime.NumCPU())
needTrackResources := e.cfg.Run.IsVerbose || e.cfg.Run.PrintResourcesUsage
trackResourcesEndCh := make(chan struct{})
defer func() { // XXX: this defer must be before ctx.cancel defer

View File

@ -2,7 +2,7 @@
// See LICENSE for licensing information
// Package lint defines common interfaces for Go code checkers.
package lint // import "mvdan.cc/lint"
package lint
import (
"go/token"

View File

@ -15,8 +15,8 @@ import (
"github.com/golangci/go-tools/ssa/ssautil"
"golang.org/x/tools/go/loader"
"github.com/golangci/lint"
"github.com/kisielk/gotool"
"mvdan.cc/lint"
)
func toDiscard(usage *varUsage) bool {