status-im
/
nimbus-eth2
mirror of https://github.com/status-im/nimbus-eth2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

All logs should be stored in appropriate node's folder - related to #1349

This commit is contained in:
Viktor Kirilov 2020-07-28 20:13:53 +03:00
parent ac12af16bf
commit 0ffcbd10e5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -185,7 +185,7 @@ medalla-vc: | beacon_node validator_client
build/beacon_node \ build/beacon_node \
--network=medalla \ --network=medalla \
--log-level="$(LOG_LEVEL)" \ --log-level="$(LOG_LEVEL)" \
--log-file=nbc_bn_$$(date +"%Y%m%d%H%M%S").log \ --log-file=build/data/shared_medalla_$(NODE_ID)/nbc_bn_$$(date +"%Y%m%d%H%M%S").log \
--data-dir=build/data/shared_medalla_$(NODE_ID) \ --data-dir=build/data/shared_medalla_$(NODE_ID) \
--validators-dir=build/data/shared_medalla_$(NODE_ID)/empty_dummy_folder \ --validators-dir=build/data/shared_medalla_$(NODE_ID)/empty_dummy_folder \
--secrets-dir=build/data/shared_medalla_$(NODE_ID)/empty_dummy_folder \ --secrets-dir=build/data/shared_medalla_$(NODE_ID)/empty_dummy_folder \
@ -193,7 +193,7 @@ medalla-vc: | beacon_node validator_client
sleep 4 sleep 4
build/validator_client \ build/validator_client \
--log-level="$(LOG_LEVEL)" \ --log-level="$(LOG_LEVEL)" \
--log-file=nbc_vc_$$(date +"%Y%m%d%H%M%S").log \ --log-file=build/data/shared_medalla_$(NODE_ID)/nbc_vc_$$(date +"%Y%m%d%H%M%S").log \
--data-dir=build/data/shared_medalla_$(NODE_ID) \ --data-dir=build/data/shared_medalla_$(NODE_ID) \
--rpc-port=$$(( $(BASE_RPC_PORT) +$(NODE_ID) )) --rpc-port=$$(( $(BASE_RPC_PORT) +$(NODE_ID) ))
@ -230,7 +230,7 @@ altona-vc: | beacon_node validator_client
build/beacon_node \ build/beacon_node \
--network=altona \ --network=altona \
--log-level="$(LOG_LEVEL)" \ --log-level="$(LOG_LEVEL)" \
--log-file=nbc_bn_$$(date +"%Y%m%d%H%M%S").log \ --log-file=build/data/shared_altona_$(NODE_ID)/nbc_bn_$$(date +"%Y%m%d%H%M%S").log \
--data-dir=build/data/shared_altona_$(NODE_ID) \ --data-dir=build/data/shared_altona_$(NODE_ID) \
--validators-dir=build/data/shared_altona_$(NODE_ID)/empty_dummy_folder \ --validators-dir=build/data/shared_altona_$(NODE_ID)/empty_dummy_folder \
--secrets-dir=build/data/shared_altona_$(NODE_ID)/empty_dummy_folder \ --secrets-dir=build/data/shared_altona_$(NODE_ID)/empty_dummy_folder \
@ -238,7 +238,7 @@ altona-vc: | beacon_node validator_client
sleep 4 sleep 4
build/validator_client \ build/validator_client \
--log-level="$(LOG_LEVEL)" \ --log-level="$(LOG_LEVEL)" \
--log-file=nbc_vc_$$(date +"%Y%m%d%H%M%S").log \ --log-file=build/data/shared_altona_$(NODE_ID)/nbc_vc_$$(date +"%Y%m%d%H%M%S").log \
--data-dir=build/data/shared_altona_$(NODE_ID) \ --data-dir=build/data/shared_altona_$(NODE_ID) \
--rpc-port=$$(( $(BASE_RPC_PORT) +$(NODE_ID) )) --rpc-port=$$(( $(BASE_RPC_PORT) +$(NODE_ID) ))

2
beacon_chain/validator_api.nim
View File

@ -42,7 +42,7 @@ proc parsePubkey(str: string): ValidatorPubKey =
proc doChecksAndGetCurrentHead(node: BeaconNode, slot: Slot): BlockRef = proc doChecksAndGetCurrentHead(node: BeaconNode, slot: Slot): BlockRef =
result = node.blockPool.head result = node.blockPool.head
if not node.isSynced(result): if not node.isSynced(result):
raise newException(CatchableError, "Cannot fulfill request until ndoe is synced") raise newException(CatchableError, "Cannot fulfill request until node is synced")
# TODO for now we limit the requests arbitrarily by up to 2 epochs into the future # TODO for now we limit the requests arbitrarily by up to 2 epochs into the future
if result.slot + uint64(2 * SLOTS_PER_EPOCH) < slot: if result.slot + uint64(2 * SLOTS_PER_EPOCH) < slot:
raise newException(CatchableError, "Requesting way ahead of the current head") raise newException(CatchableError, "Requesting way ahead of the current head")