epistemophiliac/fabric-samples
1
0
Fork 0
mirror of https://github.com/hyperledger/fabric-samples.git synced 2026-06-17 15:35:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add chaincode logging for binary chaincode in test-network-nano-bash

Browse source 
- Correct sh compability in ca_utils.sh
- Correct linux compatibility in external builder

Signed-off-by: Chris Elder <celder628@gmail.com>
Signed-off-by: Chris Elder <celder@Chriss-MacBook-Pro.local>
This commit is contained in:
Chris Elder 2024-06-14 12:29:52 -04:00 committed by Dave Enyeart
parent 29e695187a
commit 3622a5e383
3 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
test-network-nano-bash/ca/ca_utils.sh
View file

@ -10,7 +10,7 @@
# Primary purpose it to create enrollment certificates for CA admins. # Primary purpose it to create enrollment certificates for CA admins.
###################################################################################### ######################################################################################
function createEnrollment() { createEnrollment() {
local port=$1 # port of the CA used for creating the enrollment local port=$1 # port of the CA used for creating the enrollment
local username=$2 # username of the registered user on the CA local username=$2 # username of the registered user on the CA
@ -37,7 +37,7 @@ function createEnrollment() {
# #
###################################################################################### ######################################################################################
function createMSP() { createMSP() {
local caname=$1 # name of the ca (ordererca, org1ca, org2ca) local caname=$1 # name of the ca (ordererca, org1ca, org2ca)
local orgname=$2 # name of the org (org1, org2) Ordering Org is blank local orgname=$2 # name of the org (org1, org2) Ordering Org is blank
@ -61,7 +61,7 @@ function createMSP() {
# enrollent and TLS certificates for peers and orderers. # enrollent and TLS certificates for peers and orderers.
###################################################################################### ######################################################################################
function registerAndEnroll() { registerAndEnroll() {
local port=$1 # port of the CA used for creating the enrollment local port=$1 # port of the CA used for creating the enrollment
local username=$2 # username of the user to register on the CA local username=$2 # username of the user to register on the CA

5
test-network-nano-bash/external_builders/golang/bin/run
View file

@ -7,6 +7,8 @@ exec 1>&2
BUILD_OUTPUT_DIR="$1" BUILD_OUTPUT_DIR="$1"
RUN_METADATA_DIR="$2" RUN_METADATA_DIR="$2"
LOG_DIRECTORY=${PWD}/logs
####################################### #######################################
# Export environment variables and extract certificate files from chaincode.json # Export environment variables and extract certificate files from chaincode.json
# Globals: # Globals:
@ -51,5 +53,4 @@ process_chaincode_metadata_json
# output for debug purposes # output for debug purposes
env | grep CORE | sort env | grep CORE | sort
exec "${BUILD_OUTPUT_DIR}/chaincode" -peer.address="${CORE_PEER_ADDRESS}" > ${LOG_DIRECTORY}/${CORE_CHAINCODE_ID_NAME}.log 2>&1
exec "${BUILD_OUTPUT_DIR}/chaincode" -peer.address="${CORE_PEER_ADDRESS}"

15
test-network-nano-bash/external_builders/node/bin/run
View file

@ -8,6 +8,8 @@ exec 1>&2
BUILD_OUTPUT_DIR="$1" BUILD_OUTPUT_DIR="$1"
RUN_METADATA_DIR="$2" RUN_METADATA_DIR="$2"
LOG_DIRECTORY=${PWD}/logs
cd "${BUILD_OUTPUT_DIR}" cd "${BUILD_OUTPUT_DIR}"
ls -lart ls -lart
@ -35,11 +37,16 @@ else
jq -r .client_key "$RUN_METADATA_DIR/chaincode.json" > "$CORE_TLS_CLIENT_KEY_FILE" jq -r .client_key "$RUN_METADATA_DIR/chaincode.json" > "$CORE_TLS_CLIENT_KEY_FILE"
jq -r .root_cert "$RUN_METADATA_DIR/chaincode.json" > "$CORE_PEER_TLS_ROOTCERT_FILE" jq -r .root_cert "$RUN_METADATA_DIR/chaincode.json" > "$CORE_PEER_TLS_ROOTCERT_FILE"
if [ "${OSTYPE}" == "linux-gnu" ]; then
base64 -w 0 "${CORE_TLS_CLIENT_CERT_FILE}" > "${CORE_TLS_CLIENT_CERT_PATH}"
base64 -w 0 "${CORE_TLS_CLIENT_KEY_FILE}" > "${CORE_TLS_CLIENT_KEY_PATH}"
elif [[ "${OSTYPE}" == "darwin"* ]]; then
base64 -i "${CORE_TLS_CLIENT_CERT_FILE}" > "${CORE_TLS_CLIENT_CERT_PATH}" base64 -i "${CORE_TLS_CLIENT_CERT_FILE}" > "${CORE_TLS_CLIENT_CERT_PATH}"
base64 -i "${CORE_TLS_CLIENT_KEY_FILE}" > "${CORE_TLS_CLIENT_KEY_PATH}" base64 -i "${CORE_TLS_CLIENT_KEY_FILE}" > "${CORE_TLS_CLIENT_KEY_PATH}"
else
#base64 -w 0 "${CORE_TLS_CLIENT_CERT_FILE}" > "${CORE_TLS_CLIENT_CERT_PATH}" echo "OS "${OS}" not supported"
#base64 -w 0 "${CORE_TLS_CLIENT_KEY_FILE}" > "${CORE_TLS_CLIENT_KEY_PATH}" exit 1
fi
ls -lart "$BUILD_OUTPUT_DIR" ls -lart "$BUILD_OUTPUT_DIR"
fi fi
@ -48,4 +55,4 @@ fi
env | grep CORE | sort env | grep CORE | sort
# run the chaincode # run the chaincode
exec npm start -- --peer.address="${CORE_PEER_ADDRESS}" exec npm start -- --peer.address="${CORE_PEER_ADDRESS}" > ${LOG_DIRECTORY}/${CORE_CHAINCODE_ID_NAME}.log 2>&1