crowetic/qortal
1
0
Fork 0
forked from Qortal/qortal
Code Pull Requests Activity

Improved logging when importing transactions.

Browse Source
This commit is contained in:
CalDescent 2022-05-13 12:31:48 +01:00
parent ab0fc07ee9
commit 3c2ba4a0ea
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/org/qortal/controller/TransactionImporter.java
View File

@ -213,7 +213,7 @@ public class TransactionImporter extends Thread {
try { try {
ReentrantLock blockchainLock = Controller.getInstance().getBlockchainLock(); ReentrantLock blockchainLock = Controller.getInstance().getBlockchainLock();
if (!blockchainLock.tryLock(2, TimeUnit.SECONDS)) { if (!blockchainLock.tryLock(2, TimeUnit.SECONDS)) {
LOGGER.debug("Too busy to process incoming transactions queue"); LOGGER.debug("Too busy to import incoming transactions queue");
return; return;
} }
} catch (InterruptedException e) { } catch (InterruptedException e) {
@ -221,8 +221,9 @@ public class TransactionImporter extends Thread {
return; return;
} }
LOGGER.debug("Processing incoming transactions queue (size {})...", sigValidTransactions.size()); LOGGER.debug("Importing incoming transactions queue (size {})...", sigValidTransactions.size());
int processedCount = 0;
try (final Repository repository = RepositoryManager.getRepository()) { try (final Repository repository = RepositoryManager.getRepository()) {
// Import transactions with valid signatures // Import transactions with valid signatures
@ -233,7 +234,7 @@ public class TransactionImporter extends Thread {
} }
if (Synchronizer.getInstance().isSyncRequestPending()) { if (Synchronizer.getInstance().isSyncRequestPending()) {
LOGGER.debug("Breaking out of transaction processing with {} remaining, because a sync request is pending", sigValidTransactions.size() - i); LOGGER.debug("Breaking out of transaction importing with {} remaining, because a sync request is pending", sigValidTransactions.size() - i);
return; return;
} }
@ -241,6 +242,7 @@ public class TransactionImporter extends Thread {
Transaction transaction = Transaction.fromData(repository, transactionData); Transaction transaction = Transaction.fromData(repository, transactionData);
Transaction.ValidationResult validationResult = transaction.importAsUnconfirmed(); Transaction.ValidationResult validationResult = transaction.importAsUnconfirmed();
processedCount++;
switch (validationResult) { switch (validationResult) {
case TRANSACTION_ALREADY_EXISTS: { case TRANSACTION_ALREADY_EXISTS: {
@ -285,12 +287,12 @@ public class TransactionImporter extends Thread {
removeIncomingTransaction(transactionData.getSignature()); removeIncomingTransaction(transactionData.getSignature());
} }
} finally { } finally {
LOGGER.debug("Finished processing incoming transactions queue"); LOGGER.debug("Finished importing {} incoming transaction{}", processedCount, (processedCount == 1 ? "" : "s"));
ReentrantLock blockchainLock = Controller.getInstance().getBlockchainLock(); ReentrantLock blockchainLock = Controller.getInstance().getBlockchainLock();
blockchainLock.unlock(); blockchainLock.unlock();
} }
} catch (DataException e) { } catch (DataException e) {
LOGGER.error("Repository issue while processing incoming transactions", e); LOGGER.error("Repository issue while importing incoming transactions", e);
} }
} }