[FAB-13283] Update sample code for commercial paper

- Update CORE_LOGGING_LEVEL to FABRIC_LOGGING_SPEC
- Add port as an argument in case default port is used

Change-Id: I29725a100a095b2b6f2ec6262e7b70730445385e
Signed-off-by: Wenjian Qiao <wenjianq@gmail.com>
This commit is contained in:
wenjian3 2018-12-14 11:21:38 -05:00
parent 89fff6df43
commit ab46e3548c
4 changed files with 24 additions and 12 deletions

View file

@ -18,7 +18,7 @@ services:
environment: environment:
- GOPATH=/opt/gopath - GOPATH=/opt/gopath
- CORE_VM_ENDPOINT=unix:///host/var/run/docker.sock - CORE_VM_ENDPOINT=unix:///host/var/run/docker.sock
- CORE_LOGGING_LEVEL=info - FABRIC_LOGGING_SPEC=info
- CORE_PEER_ID=cli - CORE_PEER_ID=cli
- CORE_PEER_ADDRESS=peer0.org1.example.com:7051 - CORE_PEER_ADDRESS=peer0.org1.example.com:7051
- CORE_PEER_LOCALMSPID=Org1MSP - CORE_PEER_LOCALMSPID=Org1MSP

View file

@ -7,19 +7,25 @@
if [ -z "$1" ]; then if [ -z "$1" ]; then
DOCKER_NETWORK=basicnetwork_basic DOCKER_NETWORK=basicnetwork_basic
else else
DOCKER_NETWORK="$1" DOCKER_NETWORK="$1"
fi fi
echo Starting monitoring on all containers on the network ${DOCKER_NETWORK} if [ -z "$2" ]; then
PORT=8000
else
PORT="$2"
fi
echo Starting monitoring on all containers on the network ${DOCKER_NETWORK}
docker kill logspout 2> /dev/null 1>&2 || true docker kill logspout 2> /dev/null 1>&2 || true
docker rm logspout 2> /dev/null 1>&2 || true docker rm logspout 2> /dev/null 1>&2 || true
docker run -d --name="logspout" \ docker run -d --name="logspout" \
--volume=/var/run/docker.sock:/var/run/docker.sock \ --volume=/var/run/docker.sock:/var/run/docker.sock \
--publish=127.0.0.1:8000:80 \ --publish=127.0.0.1:${PORT}:80 \
--network ${DOCKER_NETWORK} \ --network ${DOCKER_NETWORK} \
gliderlabs/logspout gliderlabs/logspout
sleep 3 sleep 3
curl http://127.0.0.1:8000/logs curl http://127.0.0.1:${PORT}/logs

View file

@ -18,7 +18,7 @@ services:
environment: environment:
- GOPATH=/opt/gopath - GOPATH=/opt/gopath
- CORE_VM_ENDPOINT=unix:///host/var/run/docker.sock - CORE_VM_ENDPOINT=unix:///host/var/run/docker.sock
- CORE_LOGGING_LEVEL=info - FABRIC_LOGGING_SPEC=info
- CORE_PEER_ID=cli - CORE_PEER_ID=cli
- CORE_PEER_ADDRESS=peer0.org1.example.com:7051 - CORE_PEER_ADDRESS=peer0.org1.example.com:7051
- CORE_PEER_LOCALMSPID=Org1MSP - CORE_PEER_LOCALMSPID=Org1MSP

View file

@ -7,19 +7,25 @@
if [ -z "$1" ]; then if [ -z "$1" ]; then
DOCKER_NETWORK=basicnetwork_basic DOCKER_NETWORK=basicnetwork_basic
else else
DOCKER_NETWORK="$1" DOCKER_NETWORK="$1"
fi fi
echo Starting monitoring on all containers on the network ${DOCKER_NETWORK} if [ -z "$2" ]; then
PORT=8000
else
PORT="$2"
fi
echo Starting monitoring on all containers on the network ${DOCKER_NETWORK}
docker kill logspout 2> /dev/null 1>&2 || true docker kill logspout 2> /dev/null 1>&2 || true
docker rm logspout 2> /dev/null 1>&2 || true docker rm logspout 2> /dev/null 1>&2 || true
docker run -d --name="logspout" \ docker run -d --name="logspout" \
--volume=/var/run/docker.sock:/var/run/docker.sock \ --volume=/var/run/docker.sock:/var/run/docker.sock \
--publish=127.0.0.1:8000:80 \ --publish=127.0.0.1:${PORT}:80 \
--network ${DOCKER_NETWORK} \ --network ${DOCKER_NETWORK} \
gliderlabs/logspout gliderlabs/logspout
sleep 3 sleep 3
curl http://127.0.0.1:8000/logs curl http://127.0.0.1:${PORT}/logs