From 6ce139e80150b27b745752226358d3fef3408ec1 Mon Sep 17 00:00:00 2001 From: ssallam Date: Wed, 28 Aug 2019 15:10:30 +0200 Subject: [PATCH] Update compose files to match new style in `feature/optimize` branch and introduce a new env var for setting log level in both brizo and ocean_events_handler --- compose-files/brizo.yml | 3 ++- compose-files/events_handler.yml | 11 ++++++----- start_ocean.sh | 8 ++++++-- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/compose-files/brizo.yml b/compose-files/brizo.yml index 55cbf5d..3f927a2 100644 --- a/compose-files/brizo.yml +++ b/compose-files/brizo.yml @@ -19,7 +19,8 @@ services: SECRET_STORE_URL: ${SECRET_STORE_URL} PARITY_ADDRESS: ${PUBLISHER_ADDRESS} PARITY_PASSWORD: ${PUBLISHER_PASSWORD} - PARITY_KEYFILE: "/parity-data/keys/validator0.json" + PARITY_KEYFILE: ${PUBLISHER_KEYFILE} + LOG_LEVEL: ${BRIZO_LOG_LEVEL} volumes: - ${KEEPER_ARTIFACTS_FOLDER}:/usr/local/keeper-contracts:ro - ../networks/spree/authorities/:/parity-data/keys diff --git a/compose-files/events_handler.yml b/compose-files/events_handler.yml index 94e8df8..c157ff2 100644 --- a/compose-files/events_handler.yml +++ b/compose-files/events_handler.yml @@ -9,12 +9,13 @@ services: - keeper-node environment: KEEPER_URL: ${KEEPER_RPC_URL} - PARITY_URL: ${KEEPER_RPC_URL} - SECRET_STORE_URL: "http://secret-store:12001" - PARITY_ADDRESS: "0x00bd138abd70e2f00903268f3db08f2d25677c9e" - PARITY_PASSWORD: "node0" - PARITY_KEYFILE: "/parity-data/keys/validator0.json" + PARITY_URL: ${SIGNING_NODE_URL} + SECRET_STORE_URL: ${SECRET_STORE_URL} + PARITY_ADDRESS: ${PUBLISHER_ADDRESS} + PARITY_PASSWORD: ${PUBLISHER_PASSWORD} + PARITY_KEYFILE: ${PUBLISHER_KEYFILE} LOCAL_CONTRACTS: ${KEEPER_DEPLOY_CONTRACTS} + LOG_LEVEL: ${EVENTS_HANDLER_LOG_LEVEL} volumes: - ${KEEPER_ARTIFACTS_FOLDER}:/usr/local/keeper-contracts:ro - ../networks/spree/authorities/:/parity-data/keys diff --git a/start_ocean.sh b/start_ocean.sh index 6809677..e92536e 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -64,10 +64,14 @@ export DB_CLIENT_KEY="" export DB_CLIENT_CERT="" CHECK_ELASTIC_VM_COUNT=true +export BRIZO_LOG_LEVEL=DEBUG +export EVENTS_HANDLER_LOG_LEVEL=DEBUG + # Set a valid parity address and password to have seamless interaction with the `keeper` # it has to exist on the secret store signing node and as well on the keeper node -export PUBLISHER_ADDRESS=0x068ed00cf0441e4829d9784fcbe7b9e26d4bd8d0 -export PUBLISHER_PASSWORD=secret +export PUBLISHER_ADDRESS=0x00bd138abd70e2f00903268f3db08f2d25677c9e +export PUBLISHER_PASSWORD=node0 +export PUBLISHER_KEYFILE="/parity-data/keys/validator0.json" export SECRET_STORE_URL=http://secret-store:12001 export SIGNING_NODE_URL=http://secret-store-signing-node:8545