Skip to content

Commit

Permalink
Fix and reformat produced block timing log (hyperledger#6916)
Browse files Browse the repository at this point in the history
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
  • Loading branch information
fab-10 authored and macfarla committed Apr 26, 2024
1 parent 70979cd commit c8f5b30
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public Duration end(final String step) {

@Override
public String toString() {
final var sb = new StringBuilder("Started at " + startedAt + ", ");
final var sb = new StringBuilder("started at " + startedAt + ", ");

var prevDuration = Duration.ZERO;
for (final var entry : timing.entrySet()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ protected boolean mineBlock() throws InterruptedException {
}

private void logProducedBlock(final Block block, final BlockCreationTiming blockCreationTiming) {
String log =
LOG.info(
String.format(
"Produced #%,d / %d tx / %d om / %,d (%01.1f%%) gas / (%s) in %01.3fs",
block.getHeader().getNumber(),
Expand All @@ -177,13 +177,9 @@ private void logProducedBlock(final Block block, final BlockCreationTiming block
block.getHeader().getGasUsed(),
(block.getHeader().getGasUsed() * 100.0) / block.getHeader().getGasLimit(),
block.getHash(),
blockCreationTiming.end("log").getSeconds() / 1000.0);
blockCreationTiming.end("log").toMillis() / 1000.0));

if (LOG.isDebugEnabled()) {
log = log + ", timing [" + blockCreationTiming + "]";
}

LOG.info(log);
LOG.debug("Timing #{} / {}", block.getHeader().getNumber(), blockCreationTiming);
}

public void cancel() {
Expand Down

0 comments on commit c8f5b30

Please sign in to comment.