review cmts

Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
This commit is contained in:
Matthew B White 2021-10-28 15:07:42 +01:00 committed by denyeart
parent 337584045d
commit 6627cd6d65
2 changed files with 18 additions and 19 deletions

View file

@ -44,28 +44,28 @@ RCAADMIN_AUTH=rcaadmin:rcaadminpw
function print_help() { function print_help() {
log log
log "--- Fabric Information" log "--- Fabric Information"
log "Fabric Version is \t ${FABRIC_VERSION}" log "Fabric Version \t\t: ${FABRIC_VERSION}"
log "Fabric CA Version is \t ${FABRIC_CA_VERSION}" log "Fabric CA Version \t: ${FABRIC_CA_VERSION}"
log "Container Registry is \t ${FABRIC_CONTAINER_REGISTRY}" log "Container Registry \t: ${FABRIC_CONTAINER_REGISTRY}"
log "Network name is \t ${NETWORK_NAME}" log "Network name \t\t: ${NETWORK_NAME}"
log "Channel name is \t ${CHANNEL_NAME}" log "Channel name \t\t: ${CHANNEL_NAME}"
log log
log "--- Targetted Chaincode Information" log "--- Chaincode Information"
log "Chaincode name is \t ${CHAINCODE_NAME}" log "Chaincode name \t\t: ${CHAINCODE_NAME}"
log "Chaincode image is \t ${CHAINCODE_IMAGE}" log "Chaincode image \t: ${CHAINCODE_IMAGE}"
log "Chaincode lavel is \t ${CHAINCODE_LABEL}" log "Chaincode label \t: ${CHAINCODE_LABEL}"
log log
log "--- Cluster Information" log "--- Cluster Information"
log "Cluster name is \t ${CLUSTER_NAME}" log "Cluster name \t\t: ${CLUSTER_NAME}"
log "Cluster namespace is \t ${NS}" log "Cluster namespace \t: ${NS}"
log "Local Registry is \t ${LOCAL_REGISTRY_NAME}" log "Local Registry \t\t: ${LOCAL_REGISTRY_NAME}"
log "Local Registry port is \t ${LOCAL_REGISTRY_PORT}" log "Local Registry port \t: ${LOCAL_REGISTRY_PORT}"
log "nginx http port is \t ${NGINX_HTTP_PORT}" log "nginx http port \t: ${NGINX_HTTP_PORT}"
log "nginx https port is \t ${NGINX_HTTP2_PORT}" log "nginx https port \t: ${NGINX_HTTPS_PORT}"
log log
log "--- Script Information" log "--- Script Information"
log "Log file written to \t ${LOG_FILE}" log "Log file \t\t: ${LOG_FILE}"
log "Debug log written to \t ${DEBUG_FILE}" log "Debug log file \t\t: ${DEBUG_FILE}"
log log

View file

@ -19,8 +19,7 @@ function logging_init() {
exec 1>>${DEBUG_FILE} 2>>${DEBUG_FILE} exec 1>>${DEBUG_FILE} 2>>${DEBUG_FILE}
# There can be a race between the tail starting and the next log statement # There can be a race between the tail starting and the next log statement
# write nothing to the file to kill a (very small) bit of time sleep 0.5
echo -ne >>${LOG_FILE}
} }
function exit_fn() { function exit_fn() {