From 6627cd6d6544f53fff1171f6be7d58a0686395ee Mon Sep 17 00:00:00 2001 From: Matthew B White Date: Thu, 28 Oct 2021 15:07:42 +0100 Subject: [PATCH] review cmts Signed-off-by: Matthew B White --- test-network-k8s/network | 34 +++++++++++++++---------------- test-network-k8s/scripts/utils.sh | 3 +-- 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/test-network-k8s/network b/test-network-k8s/network index 447f2d48..a1008235 100755 --- a/test-network-k8s/network +++ b/test-network-k8s/network @@ -44,28 +44,28 @@ RCAADMIN_AUTH=rcaadmin:rcaadminpw function print_help() { log log "--- Fabric Information" - log "Fabric Version is \t ${FABRIC_VERSION}" - log "Fabric CA Version is \t ${FABRIC_CA_VERSION}" - log "Container Registry is \t ${FABRIC_CONTAINER_REGISTRY}" - log "Network name is \t ${NETWORK_NAME}" - log "Channel name is \t ${CHANNEL_NAME}" + log "Fabric Version \t\t: ${FABRIC_VERSION}" + log "Fabric CA Version \t: ${FABRIC_CA_VERSION}" + log "Container Registry \t: ${FABRIC_CONTAINER_REGISTRY}" + log "Network name \t\t: ${NETWORK_NAME}" + log "Channel name \t\t: ${CHANNEL_NAME}" log - log "--- Targetted Chaincode Information" - log "Chaincode name is \t ${CHAINCODE_NAME}" - log "Chaincode image is \t ${CHAINCODE_IMAGE}" - log "Chaincode lavel is \t ${CHAINCODE_LABEL}" + log "--- Chaincode Information" + log "Chaincode name \t\t: ${CHAINCODE_NAME}" + log "Chaincode image \t: ${CHAINCODE_IMAGE}" + log "Chaincode label \t: ${CHAINCODE_LABEL}" log log "--- Cluster Information" - log "Cluster name is \t ${CLUSTER_NAME}" - log "Cluster namespace is \t ${NS}" - log "Local Registry is \t ${LOCAL_REGISTRY_NAME}" - log "Local Registry port is \t ${LOCAL_REGISTRY_PORT}" - log "nginx http port is \t ${NGINX_HTTP_PORT}" - log "nginx https port is \t ${NGINX_HTTP2_PORT}" + log "Cluster name \t\t: ${CLUSTER_NAME}" + log "Cluster namespace \t: ${NS}" + log "Local Registry \t\t: ${LOCAL_REGISTRY_NAME}" + log "Local Registry port \t: ${LOCAL_REGISTRY_PORT}" + log "nginx http port \t: ${NGINX_HTTP_PORT}" + log "nginx https port \t: ${NGINX_HTTPS_PORT}" log log "--- Script Information" - log "Log file written to \t ${LOG_FILE}" - log "Debug log written to \t ${DEBUG_FILE}" + log "Log file \t\t: ${LOG_FILE}" + log "Debug log file \t\t: ${DEBUG_FILE}" log diff --git a/test-network-k8s/scripts/utils.sh b/test-network-k8s/scripts/utils.sh index b00802e3..b777865c 100644 --- a/test-network-k8s/scripts/utils.sh +++ b/test-network-k8s/scripts/utils.sh @@ -19,8 +19,7 @@ function logging_init() { exec 1>>${DEBUG_FILE} 2>>${DEBUG_FILE} # 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 - echo -ne >>${LOG_FILE} + sleep 0.5 } function exit_fn() {