[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>

commercial-paper/organization/digibank/configuration/cli/docker-compose.yml

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

commercial-paper/organization/digibank/configuration/cli/monitordocker.sh

@@ -7,19 +7,25 @@
 
 if [ -z "$1" ]; then
  DOCKER_NETWORK=basicnetwork_basic
-else 
+else
  DOCKER_NETWORK="$1"
 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 rm logspout 2> /dev/null 1>&2 || true
 
 docker run -d --name="logspout" \
  --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} \
- gliderlabs/logspout 
+ gliderlabs/logspout
 sleep 3
-curl http://127.0.0.1:8000/logs
+curl http://127.0.0.1:${PORT}/logs

commercial-paper/organization/magnetocorp/configuration/cli/docker-compose.yml

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

commercial-paper/organization/magnetocorp/configuration/cli/monitordocker.sh

@@ -7,19 +7,25 @@
 
 if [ -z "$1" ]; then
  DOCKER_NETWORK=basicnetwork_basic
-else 
+else
  DOCKER_NETWORK="$1"
 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 rm logspout 2> /dev/null 1>&2 || true
 
 docker run -d --name="logspout" \
  --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} \
- gliderlabs/logspout 
+ gliderlabs/logspout
 sleep 3
-curl http://127.0.0.1:8000/logs
+curl http://127.0.0.1:${PORT}/logs