diff --git a/blockchain/pool.go b/blockchain/pool.go index f4fd1a32..0791bdb0 100644 --- a/blockchain/pool.go +++ b/blockchain/pool.go @@ -313,7 +313,7 @@ func (pool *BlockPool) makeNextRequester() { _, err := request.Start() if err != nil { - pool.Logger.Error("Error starting block pool", "err", err) + request.Logger.Error("Error starting request", "err", err) } } diff --git a/cmd/tendermint/commands/reset_priv_validator.go b/cmd/tendermint/commands/reset_priv_validator.go index 77407cfc..1612b89c 100644 --- a/cmd/tendermint/commands/reset_priv_validator.go +++ b/cmd/tendermint/commands/reset_priv_validator.go @@ -49,6 +49,7 @@ func ResetAll(dbDir, privValFile string, logger log.Logger) { resetPrivValidatorLocal(privValFile, logger) if err := os.RemoveAll(dbDir); err != nil { logger.Error("Error removing directory", "err", err) + return } logger.Info("Removed all data", "dir", dbDir) } diff --git a/consensus/reactor.go b/consensus/reactor.go index 0eaacefd..e873ddde 100644 --- a/consensus/reactor.go +++ b/consensus/reactor.go @@ -99,7 +99,7 @@ func (conR *ConsensusReactor) SwitchToConsensus(state *sm.State, blocksSynced in } _, err := conR.conS.Start() if err != nil { - conR.Logger.Error("Error starting conR", "err", err) + conR.Logger.Error("Error starting conS", "err", err) } } diff --git a/consensus/state.go b/consensus/state.go index c50e431e..2c2b5d1f 100644 --- a/consensus/state.go +++ b/consensus/state.go @@ -260,6 +260,7 @@ func (cs *ConsensusState) startRoutines(maxSteps int) { _, err := cs.timeoutTicker.Start() if err != nil { cs.Logger.Error("Error starting timeout ticker", "err", err) + return } go cs.receiveRoutine(maxSteps) }