diff --git a/Makefile b/Makefile index 79ac22797..dfa275e5d 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ install: go install github.com/tendermint/tendermint/cmd/debora go install github.com/tendermint/tendermint/cmd/stdinwriter go install github.com/tendermint/tendermint/cmd/logjack - @echo -n `git rev-parse --verify HEAD` > $(TMROOT)/revisions + @echo -n `git rev-parse --verify HEAD` >> $(TMROOT)/revisions build: go build -o build/tendermint github.com/tendermint/tendermint/cmd/tendermint @@ -48,4 +48,4 @@ gen_client: go generate rpc/core_client/*.go revision: - @echo -n `git rev-parse --verify HEAD` > $(TMROOT)/revisions + @echo -n `git rev-parse --verify HEAD` >> $(TMROOT)/revisions diff --git a/common/throttle_timer.go b/common/throttle_timer.go index c1c012a01..0b40a60c2 100644 --- a/common/throttle_timer.go +++ b/common/throttle_timer.go @@ -46,7 +46,12 @@ func (t *ThrottleTimer) Set() { } } +// For ease of .Stop()'ing services before .Start()'ing them, +// we ignore .Stop()'s on nil ThrottleTimers func (t *ThrottleTimer) Stop() bool { + if t == nil { + return false + } close(t.quit) return t.timer.Stop() }