Merge pull request #56 from tendermint/develop

Merge develop into master

.gitignore

@@ -1,5 +1,6 @@
+*/vendor
+*/.glide
 .terraform
 terraform.tfstate
 terraform.tfstate.backup
-terraform.tfstate.d
-
+terraform.tfstate.d

tm-bench/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.5
+FROM alpine:3.6
 
 WORKDIR /app
 COPY tm-bench /app/tm-bench

tm-bench/Dockerfile.dev

@@ -7,6 +7,6 @@ COPY Makefile /go/src/github.com/tendermint/tools/tm-bench/
 COPY glide.yaml /go/src/github.com/tendermint/tools/tm-bench/
 COPY glide.lock /go/src/github.com/tendermint/tools/tm-bench/
 
-RUN make get_deps
+RUN make get_vendor_deps
 
 COPY . /go/src/github.com/tendermint/tools/tm-bench

tm-bench/Makefile

@@ -7,7 +7,7 @@ GOTOOLS = \
 tools:
 	go get -v $(GOTOOLS)
 
-get_deps: tools
+get_vendor_deps: tools
 	glide install
 
 build:
@@ -44,4 +44,4 @@ clean:
 	rm -f ./tm-bench
 	rm -rf ./dist
 
-.PHONY: tools get_deps build install test build-all dist clean build-docker
+.PHONY: tools get_vendor_deps build install test build-all dist clean build-docker

tm-bench/glide.yaml

@@ -1,16 +1,20 @@
 package: github.com/tendermint/tools/tm-bench
 import:
+- package: github.com/go-kit/kit
+  subpackages:
+  - log/term
+- package: github.com/gorilla/websocket
 - package: github.com/pkg/errors
-- package: github.com/tendermint/go-rpc
-  version: develop
+- package: github.com/rcrowley/go-metrics
+- package: github.com/tendermint/tendermint
+  version: v0.11.0
   subpackages:
-  - client
+  - rpc/lib/types
   - types
+- package: github.com/tendermint/tmlibs
+  subpackages:
+  - log
 - package: github.com/tendermint/tools
-  version: develop
+  version: 9708c66576d3e7d4fd0a5cdec7d951f1ef002efc
   subpackages:
   - tm-monitor/monitor
-- package: github.com/go-kit/kit
-  subpackages:
-  - log
-  - term

tm-bench/main.go

@@ -8,14 +8,15 @@ import (
 	"text/tabwriter"
 	"time"
 
-	"github.com/go-kit/kit/log"
 	"github.com/go-kit/kit/log/term"
 	metrics "github.com/rcrowley/go-metrics"
+
 	tmtypes "github.com/tendermint/tendermint/types"
+	"github.com/tendermint/tmlibs/log"
 	"github.com/tendermint/tools/tm-monitor/monitor"
 )
 
-var version = "0.1.0"
+var version = "0.2.0"
 
 var logger = log.NewNopLogger()
 
@@ -63,7 +64,7 @@ Examples:
 			}
 			return term.FgBgColor{}
 		}
-		logger = term.NewLogger(os.Stdout, log.NewLogfmtLogger, colorFn)
+		logger = log.NewTMLoggerWithColorFn(log.NewSyncWriter(os.Stdout), colorFn)
 	}
 
 	fmt.Printf("Running %ds test @ %s\n", duration, flag.Arg(0))
@@ -123,7 +124,7 @@ func startNodes(endpoints []string, blockCh chan<- tmtypes.Header, blockLatencyC
 
 	for i, e := range endpoints {
 		n := monitor.NewNode(e)
-		n.SetLogger(log.With(logger, "node", e))
+		n.SetLogger(logger.With("node", e))
 		n.SendBlocksTo(blockCh)
 		n.SendBlockLatenciesTo(blockLatencyCh)
 		if err := n.Start(); err != nil {