Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

logging/slotEvent: display block hash if present, empty otherwise #1705

Merged
merged 7 commits into from
May 2, 2020
Merged

logging/slotEvent: display block hash if present, empty otherwise #1705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1ddca65
logging/slotEvent: display block hash if present, empty otherwise
q9f May 1, 2020
8cc49a5
services/beaconchain: pass block root and epoch to slot event
q9f May 1, 2020
8c2769b
Merge branch 'master' into q9-log-block
q9f May 1, 2020
641186b
logging/slotEvent: adjust empty string to fixed size
q9f May 1, 2020
26dc17e
Merge branch 'master' into q9-log-block
q9f May 2, 2020
e8d96cf
logging/eventLogger: clarify variable name
q9f May 2, 2020
9bb2cd0
services/beacon: also log connected peers in slot event
q9f May 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions logging/src/main/java/tech/pegasys/teku/logging/EventLogger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,18 +66,25 @@ public void syncEvent(

public void slotEvent(
final UnsignedLong nodeSlot,
final UnsignedLong bestSlot,
final UnsignedLong justifiedEpoch,
final UnsignedLong bestBlock,
final Bytes32 bestBlockRoot,
final UnsignedLong nodeEpoch,
final UnsignedLong finalizedEpoch,
final Bytes32 finalizedRoot) {
final Bytes32 finalizedRoot,
final int numPeers) {
String blockRoot = " x ... empty";
if (nodeSlot.equals(bestBlock)) {
blockRoot = shortenHash(bestBlockRoot.toHexString());
}
final String slotEventLog =
String.format(
"Slot Event *** Current slot: %s, Head block: %s, Justified epoch: %s, Finalized epoch: %s, Finalized root: %s",
"Slot Event *** Slot: %s, Block: %s, Epoch: %s, Finalized Epoch: %s, Finalized Root: %s, Peers: %d",
nodeSlot.toString(),
bestSlot.toString(),
justifiedEpoch.toString(),
blockRoot,
nodeEpoch.toString(),
finalizedEpoch.toString(),
shortenHash(finalizedRoot.toHexString()));
shortenHash(finalizedRoot.toHexString()),
numPeers);
info(slotEventLog, Color.WHITE);
}

Expand Down
6 changes: 4 additions & 2 deletions ...nchain/src/main/java/tech/pegasys/artemis/services/beaconchain/BeaconChainController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,9 +494,11 @@ private void processSlot() {
EVENT_LOG.slotEvent(
nodeSlot.getValue(),
recentChainData.getBestSlot(),
recentChainData.getStore().getJustifiedCheckpoint().getEpoch(),
headBlockRoot,
nodeEpoch,
recentChainData.getStore().getFinalizedCheckpoint().getEpoch(),
recentChainData.getFinalizedRoot());
recentChainData.getFinalizedRoot(),
p2pNetwork.getPeerCount());
this.eventBus.post(new BroadcastAttestationEvent(headBlockRoot, nodeSlot.getValue()));
Thread.sleep(SECONDS_PER_SLOT * 1000 / 3);
this.eventBus.post(new BroadcastAggregatesEvent(nodeSlot.getValue()));
Expand Down