From 7c181379b41fabac11bd317f95cb35837c325710 Mon Sep 17 00:00:00 2001 From: CalDescent Date: Fri, 4 Mar 2022 11:12:23 +0000 Subject: [PATCH] Added more granularity to logging, to differentiate between signature validation and general processing/importing, as well as showing counts of the transactions being processed in each round. --- src/main/java/org/qortal/controller/Controller.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/qortal/controller/Controller.java b/src/main/java/org/qortal/controller/Controller.java index 40ede12f..9fa11257 100644 --- a/src/main/java/org/qortal/controller/Controller.java +++ b/src/main/java/org/qortal/controller/Controller.java @@ -855,7 +855,9 @@ public class Controller extends Thread { // Take a snapshot of incomingTransactions, so we don't need to lock it while processing Map incomingTransactionsCopy = Map.copyOf(this.incomingTransactions); - LOGGER.debug("Processing incoming transactions queue (size {})...", incomingTransactionsCopy.size()); + int unvalidatedCount = Collections.frequency(incomingTransactionsCopy.values(), Boolean.FALSE); + int validatedCount = 0; + LOGGER.debug("Validating signatures in incoming transactions queue (size {})...", unvalidatedCount); List sigValidTransactions = new ArrayList<>(); @@ -889,6 +891,10 @@ public class Controller extends Thread { continue; } + else { + // Count the number that were validated in this round, for logging purposes + validatedCount++; + } // Add mark signature as valid if transaction still exists in import queue incomingTransactions.computeIfPresent(transactionData, (k, v) -> Boolean.TRUE); @@ -900,6 +906,8 @@ public class Controller extends Thread { sigValidTransactions.add(transaction); } + LOGGER.debug("Finished validating signatures in incoming transactions queue (valid this round: {}, total pending import: {})...", validatedCount, sigValidTransactions.size()); + if (sigValidTransactions.isEmpty()) { // Don't bother locking if there are no new transactions to process return; @@ -923,6 +931,8 @@ public class Controller extends Thread { return; } + LOGGER.debug("Processing incoming transactions queue (size {})...", sigValidTransactions.size()); + // Import transactions with valid signatures try { for (int i = 0; i < sigValidTransactions.size(); ++i) {