From e124c11cb84d74087bc5b5435c5471735401e850 Mon Sep 17 00:00:00 2001 From: itamar Arjuan Date: Tue, 21 Jul 2020 09:35:05 +0300 Subject: [PATCH 1/2] adding pre checks for logging in entry point --- entrypoint.sh | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index 66b966972..fb92b0932 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,3 +1,14 @@ -#!/bin/bash +x +#!/bin/bash -/opt/orbs/orbs-node $@ | multilog s16777215 n3 '!tai64nlocal' /opt/orbs/logs 2>&1 \ No newline at end of file +multilog_err=1 +multilog_cmd="multilog s16777215 n2 '!tai64nlocal' /opt/orbs/logs" + +while [[ "${multilog_err}" -ne "0" ]]; do + sleep 1 + echo "orbs-network-go logging pre checks.." | $multilog_cmd + multilog_err=$? +done + +echo "Running orbs-network-go.." + +/opt/orbs/orbs-node $@ | $multilog_cmd 2>&1 \ No newline at end of file From e81ca4a1709a882296bcdc08ba7a855a090b4d90 Mon Sep 17 00:00:00 2001 From: itamar Arjuan Date: Tue, 21 Jul 2020 11:41:09 +0300 Subject: [PATCH 2/2] adding debug message to test contract names --- test/e2e/deploy_native_test.go | 1 + test/e2e/deploy_native_whitelist_test.go | 1 + 2 files changed, 2 insertions(+) diff --git a/test/e2e/deploy_native_test.go b/test/e2e/deploy_native_test.go index b78c43f24..33a9b5e63 100644 --- a/test/e2e/deploy_native_test.go +++ b/test/e2e/deploy_native_test.go @@ -33,6 +33,7 @@ func TestDeploymentOfNativeContract(t *testing.T) { counterStart := uint64(time.Now().UnixNano()) contractName := fmt.Sprintf("CounterFrom%d", counterStart) + fmt.Println("Will attempt to deploy contract with name: ", contractName) PrintTestTime(t, "send deploy - start", <) diff --git a/test/e2e/deploy_native_whitelist_test.go b/test/e2e/deploy_native_whitelist_test.go index 93db93d29..066748206 100644 --- a/test/e2e/deploy_native_whitelist_test.go +++ b/test/e2e/deploy_native_whitelist_test.go @@ -32,6 +32,7 @@ func TestContractWhitelist(t *testing.T) { counterStart := uint64(time.Now().UnixNano()) contractName := fmt.Sprintf("Whitelist%d", counterStart) + fmt.Println("Will attempt to deploy contract with name: ", contractName) contractSource, _ := ioutil.ReadFile("../contracts/whitelist/whitelist.go") PrintTestTime(t, "send deploy - start", <)