Skip to content

Commit 786137f

Browse files
stefantalpalaruzah
authored andcommitted
reinstate LOG_LEVEL
and introduce RUNTIME_LOG_LEVEL
1 parent 5daafd4 commit 786137f

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

Makefile

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@ SHELL := bash # the shell used internally by "make"
1111
BUILD_SYSTEM_DIR := vendor/nimbus-build-system
1212

1313
# we set its default value before LOG_LEVEL is used in "variables.mk"
14-
BUILD_LOG_LEVEL := DEBUG
15-
LOG_LEVEL := INFO
14+
LOG_LEVEL := DEBUG
15+
16+
# used by Make targets that launch a beacon node
17+
RUNTIME_LOG_LEVEL := INFO
1618

1719
LINK_PCRE := 0
1820

@@ -322,7 +324,7 @@ clean-testnet1:
322324
testnet0 testnet1: | nimbus_beacon_node nimbus_signing_process
323325
build/nimbus_beacon_node \
324326
--network=$@ \
325-
--log-level="$(LOG_LEVEL)" \
327+
--log-level="$(RUNTIME_LOG_LEVEL)" \
326328
--data-dir=build/data/$@_$(NODE_ID) \
327329
$(GOERLI_TESTNETS_PARAMS) $(NODE_PARAMS)
328330

@@ -340,7 +342,7 @@ define CONNECT_TO_NETWORK
340342
--finalized-checkpoint-block=vendor/eth2-testnets/shared/$(1)/recent-finalized-block.ssz" ; }; \
341343
$(CPU_LIMIT_CMD) build/$(2) \
342344
--network=$(1) \
343-
--log-level="$(LOG_LEVEL)" \
345+
--log-level="$(RUNTIME_LOG_LEVEL)" \
344346
--log-file=build/data/shared_$(1)_$(NODE_ID)/nbc_bn_$$(date +"%Y%m%d%H%M%S").log \
345347
--data-dir=build/data/shared_$(1)_$(NODE_ID) \
346348
$$CHECKPOINT_PARAMS $(GOERLI_TESTNETS_PARAMS) $(NODE_PARAMS)
@@ -373,7 +375,7 @@ define CONNECT_TO_NETWORK_WITH_VALIDATOR_CLIENT
373375

374376
$(CPU_LIMIT_CMD) build/$(2) \
375377
--network=$(1) \
376-
--log-level="$(LOG_LEVEL)" \
378+
--log-level="$(RUNTIME_LOG_LEVEL)" \
377379
--log-file=build/data/shared_$(1)_$(NODE_ID)/nbc_bn_$$(date +"%Y%m%d%H%M%S").log \
378380
--data-dir=build/data/shared_$(1)_$(NODE_ID) \
379381
--validators-dir=build/data/shared_$(1)_$(NODE_ID)/empty_dummy_folder \
@@ -383,7 +385,7 @@ define CONNECT_TO_NETWORK_WITH_VALIDATOR_CLIENT
383385
sleep 4
384386

385387
build/nimbus_validator_client \
386-
--log-level="$(LOG_LEVEL)" \
388+
--log-level="$(RUNTIME_LOG_LEVEL)" \
387389
--log-file=build/data/shared_$(1)_$(NODE_ID)/nbc_vc_$$(date +"%Y%m%d%H%M%S").log \
388390
--data-dir=build/data/shared_$(1)_$(NODE_ID) \
389391
--rpc-port=$$(( $(BASE_RPC_PORT) +$(NODE_ID) ))
@@ -436,7 +438,7 @@ pyrmont-vc: | pyrmont-build nimbus_validator_client
436438

437439
ifneq ($(LOG_LEVEL), TRACE)
438440
pyrmont-dev:
439-
+ "$(MAKE)" BUILD_LOG_LEVEL=TRACE LOG_LEVEL=TRACE $@
441+
+ "$(MAKE)" LOG_LEVEL=TRACE $@
440442
else
441443
pyrmont-dev: | pyrmont-build
442444
$(call CONNECT_TO_NETWORK_IN_DEV_MODE,pyrmont,nimbus_beacon_node)

0 commit comments

Comments
 (0)