Skip to content

Commit

Permalink
Merge pull request #1607 from orbs-network/feature/precheck/logging
Browse files Browse the repository at this point in the history
adding pre checks for logging in entry point
  • Loading branch information
noambergIL authored Jul 21, 2020
2 parents b580fb1 + e81ca4a commit 5685132
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 2 deletions.
15 changes: 13 additions & 2 deletions entrypoint.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
#!/bin/bash +x
#!/bin/bash

/opt/orbs/orbs-node $@ | multilog s16777215 n3 '!tai64nlocal' /opt/orbs/logs 2>&1
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
1 change: 1 addition & 0 deletions test/e2e/deploy_native_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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", &lt)

Expand Down
1 change: 1 addition & 0 deletions test/e2e/deploy_native_whitelist_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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", &lt)
Expand Down

0 comments on commit 5685132

Please sign in to comment.