From 432a7276e24afd0620d76d43110d35d0604802b9 Mon Sep 17 00:00:00 2001
From: Anton Kaliaev <anton.kalyaev@gmail.com>
Date: Thu, 9 Nov 2017 15:06:43 -0500
Subject: [PATCH] [test_integrations] enable logs from peers by default (Refs
 #829)

---
 test/p2p/peer.sh | 36 ++++++++++++------------------------
 test/test.sh     | 12 +++++-------
 2 files changed, 17 insertions(+), 31 deletions(-)

diff --git a/test/p2p/peer.sh b/test/p2p/peer.sh
index 283228f76..3b8322b65 100644
--- a/test/p2p/peer.sh
+++ b/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
-	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"
diff --git a/test/test.sh b/test/test.sh
index 2e164fb3e..64d7bfc71 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -18,14 +18,12 @@ echo "* [$(date +"%T")] removing run_test container"
 docker rm -vf run_test
 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
 	echo
 	echo "* [$(date +"%T")] building docker image"