Merge pull request #834 from tendermint/829-enable-logs-by-default

Enable logs by default

consensus/reactor.go

@@ -390,7 +390,6 @@ func (conR *ConsensusReactor) broadcastProposalHeartbeatMessage(heartbeat types.
 }
 
 func (conR *ConsensusReactor) broadcastNewRoundStep(rs *cstypes.RoundState) {
-
 	nrsMsg, csMsg := makeRoundStepMessages(rs)
 	if nrsMsg != nil {
 		conR.Switch.Broadcast(StateChannel, struct{ ConsensusMessage }{nrsMsg})

p2p/peer.go

@@ -11,6 +11,7 @@ import (
 	crypto "github.com/tendermint/go-crypto"
 	wire "github.com/tendermint/go-wire"
 	cmn "github.com/tendermint/tmlibs/common"
+	"github.com/tendermint/tmlibs/log"
 )
 
 // Peer is an interface representing a peer connected on a reactor.
@@ -136,6 +137,11 @@ func newPeerFromConnAndConfig(rawConn net.Conn, outbound bool, reactorsByCh map[
 	return p, nil
 }
 
+func (p *peer) SetLogger(l log.Logger) {
+	p.Logger = l
+	p.mconn.SetLogger(l)
+}
+
 // CloseConn should be used when the peer was created, but never started.
 func (p *peer) CloseConn() {
 	p.conn.Close()

test/p2p/atomic_broadcast/test.sh

@@ -13,39 +13,39 @@ N=$1
 
 echo ""
 # run the test on each of them
-for i in `seq 1 $N`; do
+for i in $(seq 1 "$N"); do
-	addr=$(test/p2p/ip.sh $i):46657
+	addr=$(test/p2p/ip.sh "$i"):46657
 
 	# current state
-	HASH1=`curl -s $addr/status | jq .result.latest_app_hash`
+	HASH1=$(curl -s "$addr/status" | jq .result.latest_app_hash)
-	
+
 	# - send a tx
 	TX=aadeadbeefbeefbeef0$i
 	echo "Broadcast Tx $TX"
-	curl -s $addr/broadcast_tx_commit?tx=0x$TX
+	curl -s "$addr/broadcast_tx_commit?tx=0x$TX"
 	echo ""
 
 	# we need to wait another block to get the new app_hash
-	h1=`curl -s $addr/status | jq .result.latest_block_height`
+	h1=$(curl -s "$addr/status" | jq .result.latest_block_height)
 	h2=$h1
 	while [ "$h2" == "$h1" ]; do
 		sleep 1
-		h2=`curl -s $addr/status | jq .result.latest_block_height`
+		h2=$(curl -s "$addr/status" | jq .result.latest_block_height)
 	done
 
 	# check that hash was updated
-	HASH2=`curl -s $addr/status | jq .result.latest_app_hash`
+	HASH2=$(curl -s "$addr/status" | jq .result.latest_app_hash)
 	if [[ "$HASH1" == "$HASH2" ]]; then
 		echo "Expected state hash to update from $HASH1. Got $HASH2"
 		exit 1
 	fi
 
 	# check we get the same new hash on all other nodes
-	for j in `seq 1 $N`; do
+	for j in $(seq 1 "$N"); do
 		if [[ "$i" != "$j" ]]; then
-			addrJ=$(test/p2p/ip.sh $j):46657
+			addrJ=$(test/p2p/ip.sh "$j"):46657
-			HASH3=`curl -s $addrJ/status | jq .result.latest_app_hash`
+			HASH3=$(curl -s "$addrJ/status" | jq .result.latest_app_hash)
-			
+
 			if [[ "$HASH2" != "$HASH3" ]]; then
 				echo "App hash for node $j doesn't match. Got $HASH3, expected $HASH2"
 				exit 1

test/p2p/peer.sh

@@ -14,27 +14,15 @@ set +eu
 
 echo "starting tendermint peer ID=$ID"
 # start tendermint container on the network
-if [[ "$CIRCLECI" == true ]]; then
+set -u
-	set -u
+docker run -d \
-	docker run -d \
+	--net="$NETWORK_NAME" \
-	  --net="$NETWORK_NAME" \
+	--ip=$(test/p2p/ip.sh "$ID") \
-	  --ip=$(test/p2p/ip.sh $ID) \
+	--name "local_testnet_$ID" \
-	  --name "local_testnet_$ID" \
+	--entrypoint tendermint \
-	  --entrypoint tendermint \
+	-e TMHOME="/go/src/github.com/tendermint/tendermint/test/p2p/data/mach$ID/core" \
-	  -e TMHOME="/go/src/github.com/tendermint/tendermint/test/p2p/data/mach$ID/core" \
+	--log-driver=syslog \
-		--log-driver=syslog \
+	--log-opt syslog-address=udp://127.0.0.1:5514 \
-		--log-opt syslog-address=udp://127.0.0.1:5514 \
+	--log-opt syslog-facility=daemon \
-		--log-opt syslog-facility=daemon \
+	--log-opt tag="{{.Name}}" \
-		--log-opt tag="{{.Name}}" \
+		"$DOCKER_IMAGE" node "$NODE_FLAGS" --log_level=debug --proxy_app="$APP_PROXY"
-  	  "$DOCKER_IMAGE" node $NODE_FLAGS --log_level=debug --proxy_app="$APP_PROXY"
-else
-	set -u
-	docker run -d \
-	  --net="$NETWORK_NAME" \
-	  --ip=$(test/p2p/ip.sh $ID) \
-	  --name "local_testnet_$ID" \
-	  --entrypoint tendermint \
-	  -e TMHOME="/go/src/github.com/tendermint/tendermint/test/p2p/data/mach$ID/core" \
-  	  "$DOCKER_IMAGE" node $NODE_FLAGS --log_level=info --proxy_app="$APP_PROXY"
-fi
-

test/test.sh

@@ -18,14 +18,12 @@ echo "* [$(date +"%T")] removing run_test container"
 docker rm -vf run_test
 set -e
 
-set +u
+echo
-if [[ "$CIRCLECI" == true ]]; then
+echo "* [$(date +"%T")] starting rsyslog container"
-	echo
+docker rm -f rsyslog || true
-	echo "* [$(date +"%T")] starting rsyslog container"
+docker run -d -v "$LOGS_DIR:/var/log/" -p 127.0.0.1:5514:514/udp --name rsyslog voxxit/rsyslog
-	docker rm -f rsyslog || true
-	docker run -d -v "$LOGS_DIR:/var/log/" -p 127.0.0.1:5514:514/udp --name rsyslog voxxit/rsyslog
-fi
 
+set +u
 if [[ "$SKIP_BUILD" == "" ]]; then
 	echo
 	echo "* [$(date +"%T")] building docker image"