From c0c25013074b085393413f211d2efd3960a036cf Mon Sep 17 00:00:00 2001 From: Roy Crihfield Date: Fri, 9 Jun 2023 01:50:34 +0800 Subject: [PATCH] forward more vars for debugging forward CERC_GETH_VERBOSITY forward CERC_STATEDIFF_DB_LOG_STATEMENTS forward CERC_REMOTE_DEBUG --- app/data/compose/docker-compose-fixturenet-eth.yml | 2 +- app/data/compose/docker-compose-fixturenet-plugeth.yml | 2 +- app/data/compose/docker-compose-ipld-eth-server.yml | 2 +- app/data/config/fixturenet-eth/fixturenet-eth.env | 3 ++- app/data/stacks/fixturenet-eth-loaded/README.md | 2 +- app/deploy_system.py | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/data/compose/docker-compose-fixturenet-eth.yml b/app/data/compose/docker-compose-fixturenet-eth.yml index 530cd01..663b53c 100644 --- a/app/data/compose/docker-compose-fixturenet-eth.yml +++ b/app/data/compose/docker-compose-fixturenet-eth.yml @@ -21,7 +21,7 @@ services: cap_add: - SYS_PTRACE environment: - CERC_REMOTE_DEBUG: "true" + CERC_REMOTE_DEBUG: ${CERC_REMOTE_DEBUG:-true} CERC_RUN_STATEDIFF: ${CERC_RUN_STATEDIFF:-detect} CERC_STATEDIFF_DB_NODE_ID: 1 CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG} diff --git a/app/data/compose/docker-compose-fixturenet-plugeth.yml b/app/data/compose/docker-compose-fixturenet-plugeth.yml index 58b00dc..12b5888 100644 --- a/app/data/compose/docker-compose-fixturenet-plugeth.yml +++ b/app/data/compose/docker-compose-fixturenet-plugeth.yml @@ -20,7 +20,7 @@ services: cap_add: - SYS_PTRACE environment: - CERC_REMOTE_DEBUG: "true" + CERC_REMOTE_DEBUG: ${CERC_REMOTE_DEBUG:-true} CERC_RUN_STATEDIFF: "detect" CERC_STATEDIFF_DB_NODE_ID: 1 CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG} diff --git a/app/data/compose/docker-compose-ipld-eth-server.yml b/app/data/compose/docker-compose-ipld-eth-server.yml index ee787d5..279dca7 100644 --- a/app/data/compose/docker-compose-ipld-eth-server.yml +++ b/app/data/compose/docker-compose-ipld-eth-server.yml @@ -26,7 +26,7 @@ services: PROM_HTTP_ADDR: "0.0.0.0" PROM_HTTP_PORT: "8090" LOGRUS_LEVEL: "debug" - CERC_REMOTE_DEBUG: "true" + CERC_REMOTE_DEBUG: ${CERC_REMOTE_DEBUG:-true} volumes: - type: bind source: ../config/ipld-eth-server/chain.json diff --git a/app/data/config/fixturenet-eth/fixturenet-eth.env b/app/data/config/fixturenet-eth/fixturenet-eth.env index ea56e2e..2bf489a 100644 --- a/app/data/config/fixturenet-eth/fixturenet-eth.env +++ b/app/data/config/fixturenet-eth/fixturenet-eth.env @@ -18,7 +18,8 @@ CERC_STATEDIFF_DB_NAME="cerc_testing" CERC_STATEDIFF_DB_USER="vdbm" CERC_STATEDIFF_DB_PASSWORD="password" CERC_STATEDIFF_DB_GOOSE_MIN_VER=${CERC_STATEDIFF_DB_GOOSE_MIN_VER:-18} -CERC_STATEDIFF_DB_LOG_STATEMENTS="false" +CERC_STATEDIFF_DB_LOG_STATEMENTS="${CERC_STATEDIFF_DB_LOG_STATEMENTS:-false}" CERC_STATEDIFF_WORKERS=2 CERC_GETH_VMODULE="statediff/*=5,rpc/*=5" +CERC_GETH_VERBOSITY=${CERC_GETH_VERBOSITY:-3} \ No newline at end of file diff --git a/app/data/stacks/fixturenet-eth-loaded/README.md b/app/data/stacks/fixturenet-eth-loaded/README.md index 09eab02..08ae1e3 100644 --- a/app/data/stacks/fixturenet-eth-loaded/README.md +++ b/app/data/stacks/fixturenet-eth-loaded/README.md @@ -1,4 +1,4 @@ -# fixturenet-eth +# fixturenet-eth-loaded A "loaded" version of fixturenet-eth, with all the bells and whistles enabled. diff --git a/app/deploy_system.py b/app/deploy_system.py index 2782ce5..c111294 100644 --- a/app/deploy_system.py +++ b/app/deploy_system.py @@ -196,7 +196,7 @@ def _make_runtime_env(ctx): "CERC_HOST_UID": f"{os.getuid()}", "CERC_HOST_GID": f"{os.getgid()}" } - container_exec_env.update({"CERC_SCRIPT_DEBUG": "true"} if ctx.debug else {}) + container_exec_env.update({"CERC_SCRIPT_DEBUG": "true", "CERC_REMOTE_DEBUG": "true"} if ctx.debug else {}) return container_exec_env