Browse Source

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

Enable logs by default
pull/842/head
Ethan Buchman 7 years ago
committed by GitHub
parent
commit
238e2b72ee
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 35 additions and 44 deletions
  1. +0
    -1
      consensus/reactor.go
  2. +6
    -0
      p2p/peer.go
  3. +12
    -12
      test/p2p/atomic_broadcast/test.sh
  4. +12
    -24
      test/p2p/peer.sh
  5. +5
    -7
      test/test.sh

+ 0
- 1
consensus/reactor.go View File

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


+ 6
- 0
p2p/peer.go View File

@ -11,6 +11,7 @@ import (
crypto "github.com/tendermint/go-crypto" crypto "github.com/tendermint/go-crypto"
wire "github.com/tendermint/go-wire" wire "github.com/tendermint/go-wire"
cmn "github.com/tendermint/tmlibs/common" cmn "github.com/tendermint/tmlibs/common"
"github.com/tendermint/tmlibs/log"
) )
// Peer is an interface representing a peer connected on a reactor. // 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 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. // CloseConn should be used when the peer was created, but never started.
func (p *peer) CloseConn() { func (p *peer) CloseConn() {
p.conn.Close() p.conn.Close()


+ 12
- 12
test/p2p/atomic_broadcast/test.sh View File

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


+ 12
- 24
test/p2p/peer.sh View File

@ -14,27 +14,15 @@ set +eu
echo "starting tendermint peer ID=$ID" echo "starting tendermint peer ID=$ID"
# start tendermint container on the network # start tendermint container on the network
if [[ "$CIRCLECI" == true ]]; then
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" \
--log-driver=syslog \
--log-opt syslog-address=udp://127.0.0.1:5514 \
--log-opt syslog-facility=daemon \
--log-opt tag="{{.Name}}" \
"$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
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" \
--log-driver=syslog \
--log-opt syslog-address=udp://127.0.0.1:5514 \
--log-opt syslog-facility=daemon \
--log-opt tag="{{.Name}}" \
"$DOCKER_IMAGE" node "$NODE_FLAGS" --log_level=debug --proxy_app="$APP_PROXY"

+ 5
- 7
test/test.sh View File

@ -18,14 +18,12 @@ echo "* [$(date +"%T")] removing run_test container"
docker rm -vf run_test docker rm -vf run_test
set -e set -e
set +u
if [[ "$CIRCLECI" == true ]]; then
echo
echo "* [$(date +"%T")] starting rsyslog container"
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
echo
echo "* [$(date +"%T")] starting rsyslog container"
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
set +u
if [[ "$SKIP_BUILD" == "" ]]; then if [[ "$SKIP_BUILD" == "" ]]; then
echo echo
echo "* [$(date +"%T")] building docker image" echo "* [$(date +"%T")] building docker image"


Loading…
Cancel
Save