diff --git a/src/main/java/org/qora/account/Account.java b/src/main/java/org/qora/account/Account.java index ef7b1fcd..ba4ea7f1 100644 --- a/src/main/java/org/qora/account/Account.java +++ b/src/main/java/org/qora/account/Account.java @@ -144,7 +144,7 @@ public class Account { AccountBalanceData accountBalanceData = new AccountBalanceData(this.address, assetId, balance); this.repository.getAccountRepository().save(accountBalanceData); - LOGGER.trace(this.address + " balance now: " + balance.toPlainString() + " [assetId " + assetId + "]"); + LOGGER.trace(() -> String.format("%s balance now %s [assetId %s]", this.address, balance.toPlainString(), assetId)); } public void deleteBalance(long assetId) throws DataException { @@ -227,7 +227,7 @@ public class Account { accountData.setDefaultGroupId(defaultGroupId); this.repository.getAccountRepository().setDefaultGroupId(accountData); - LOGGER.trace(String.format("Account %s defaultGroupId now %d", accountData.getAddress(), defaultGroupId)); + LOGGER.trace(() -> String.format("Account %s defaultGroupId now %d", accountData.getAddress(), defaultGroupId)); } // Account flags diff --git a/src/main/java/org/qora/controller/Controller.java b/src/main/java/org/qora/controller/Controller.java index f1d1d893..d0151b68 100644 --- a/src/main/java/org/qora/controller/Controller.java +++ b/src/main/java/org/qora/controller/Controller.java @@ -356,13 +356,13 @@ public class Controller extends Thread { case NO_BLOCKCHAIN_LOCK: case REPOSITORY_ISSUE: // These are minor failure results so fine to try again - LOGGER.info(String.format("Failed to synchronize with peer %s (%s)", peer, syncResult.name())); + LOGGER.debug(() -> String.format("Failed to synchronize with peer %s (%s)", peer, syncResult.name())); break; case OK: updateSysTray(); case NOTHING_TO_DO: - LOGGER.debug(String.format("Synchronized with peer %s (%s)", peer, syncResult.name())); + LOGGER.debug(() -> String.format("Synchronized with peer %s (%s)", peer, syncResult.name())); break; } @@ -510,7 +510,7 @@ public class Controller extends Thread { } public void onNetworkMessage(Peer peer, Message message) { - LOGGER.trace(String.format("Processing %s message from %s", message.getType().name(), peer)); + LOGGER.trace(() -> String.format("Processing %s message from %s", message.getType().name(), peer)); switch (message.getType()) { case HEIGHT: { @@ -624,7 +624,7 @@ public class Controller extends Thread { try (final Repository repository = RepositoryManager.getRepository()) { BlockData blockData = repository.getBlockRepository().fromSignature(signature); if (blockData == null) { - LOGGER.debug(String.format("Ignoring GET_BLOCK request from peer %s for unknown block %s", peer, Base58.encode(signature))); + LOGGER.debug(() -> String.format("Ignoring GET_BLOCK request from peer %s for unknown block %s", peer, Base58.encode(signature))); // Send no response at all??? break; } @@ -649,7 +649,7 @@ public class Controller extends Thread { try (final Repository repository = RepositoryManager.getRepository()) { TransactionData transactionData = repository.getTransactionRepository().fromSignature(signature); if (transactionData == null) { - LOGGER.debug(String.format("Ignoring GET_TRANSACTION request from peer %s for unknown transaction %s", peer, Base58.encode(signature))); + LOGGER.debug(() -> String.format("Ignoring GET_TRANSACTION request from peer %s for unknown transaction %s", peer, Base58.encode(signature))); // Send no response at all??? break; } @@ -674,28 +674,28 @@ public class Controller extends Thread { // Check signature if (!transaction.isSignatureValid()) { - LOGGER.trace(String.format("Ignoring %s transaction %s with invalid signature from peer %s", transactionData.getType().name(), Base58.encode(transactionData.getSignature()), peer)); + LOGGER.trace(() -> String.format("Ignoring %s transaction %s with invalid signature from peer %s", transactionData.getType().name(), Base58.encode(transactionData.getSignature()), peer)); break; } ValidationResult validationResult = transaction.importAsUnconfirmed(); if (validationResult == ValidationResult.TRANSACTION_ALREADY_EXISTS) { - LOGGER.trace(String.format("Ignoring existing transaction %s from peer %s", Base58.encode(transactionData.getSignature()), peer)); + LOGGER.trace(() -> String.format("Ignoring existing transaction %s from peer %s", Base58.encode(transactionData.getSignature()), peer)); break; } if (validationResult == ValidationResult.NO_BLOCKCHAIN_LOCK) { - LOGGER.trace(String.format("Couldn't lock blockchain to import unconfirmed transaction %s from peer %s", Base58.encode(transactionData.getSignature()), peer)); + LOGGER.trace(() -> String.format("Couldn't lock blockchain to import unconfirmed transaction %s from peer %s", Base58.encode(transactionData.getSignature()), peer)); break; } if (validationResult != ValidationResult.OK) { - LOGGER.trace(String.format("Ignoring invalid (%s) %s transaction %s from peer %s", validationResult.name(), transactionData.getType().name(), Base58.encode(transactionData.getSignature()), peer)); + LOGGER.trace(() -> String.format("Ignoring invalid (%s) %s transaction %s from peer %s", validationResult.name(), transactionData.getType().name(), Base58.encode(transactionData.getSignature()), peer)); break; } - LOGGER.debug(String.format("Imported %s transaction %s from peer %s", transactionData.getType().name(), Base58.encode(transactionData.getSignature()), peer)); + LOGGER.debug(() -> String.format("Imported %s transaction %s from peer %s", transactionData.getType().name(), Base58.encode(transactionData.getSignature()), peer)); } catch (DataException e) { LOGGER.error(String.format("Repository issue while processing transaction %s from peer %s", Base58.encode(transactionData.getSignature()), peer), e); } @@ -725,7 +725,7 @@ public class Controller extends Thread { for (byte[] signature : signatures) { // Do we have it already? (Before requesting transaction data itself) if (repository.getTransactionRepository().exists(signature)) { - LOGGER.trace(String.format("Ignoring existing transaction %s from peer %s", Base58.encode(signature), peer)); + LOGGER.trace(() -> String.format("Ignoring existing transaction %s from peer %s", Base58.encode(signature), peer)); continue; } @@ -738,7 +738,7 @@ public class Controller extends Thread { Message responseMessage = peer.getResponse(getTransactionMessage); if (responseMessage == null || !(responseMessage instanceof TransactionMessage)) { // Maybe peer no longer has this transaction - LOGGER.trace(String.format("Peer %s didn't send transaction %s", peer, Base58.encode(signature))); + LOGGER.trace(() -> String.format("Peer %s didn't send transaction %s", peer, Base58.encode(signature))); continue; } @@ -752,29 +752,29 @@ public class Controller extends Thread { // Check signature if (!transaction.isSignatureValid()) { - LOGGER.trace(String.format("Ignoring %s transaction %s with invalid signature from peer %s", transactionData.getType().name(), Base58.encode(transactionData.getSignature()), peer)); + LOGGER.trace(() -> String.format("Ignoring %s transaction %s with invalid signature from peer %s", transactionData.getType().name(), Base58.encode(transactionData.getSignature()), peer)); continue; } ValidationResult validationResult = transaction.importAsUnconfirmed(); if (validationResult == ValidationResult.TRANSACTION_ALREADY_EXISTS) { - LOGGER.trace(String.format("Ignoring existing transaction %s from peer %s", Base58.encode(transactionData.getSignature()), peer)); + LOGGER.trace(() -> String.format("Ignoring existing transaction %s from peer %s", Base58.encode(transactionData.getSignature()), peer)); continue; } if (validationResult == ValidationResult.NO_BLOCKCHAIN_LOCK) { - LOGGER.trace(String.format("Couldn't lock blockchain to import unconfirmed transaction %s from peer %s", Base58.encode(transactionData.getSignature()), peer)); + LOGGER.trace(() -> String.format("Couldn't lock blockchain to import unconfirmed transaction %s from peer %s", Base58.encode(transactionData.getSignature()), peer)); // Some other thread (e.g. Synchronizer) might have blockchain lock for a while so might as well give up for now break; } if (validationResult != ValidationResult.OK) { - LOGGER.trace(String.format("Ignoring invalid (%s) %s transaction %s from peer %s", validationResult.name(), transactionData.getType().name(), Base58.encode(transactionData.getSignature()), peer)); + LOGGER.trace(() -> String.format("Ignoring invalid (%s) %s transaction %s from peer %s", validationResult.name(), transactionData.getType().name(), Base58.encode(transactionData.getSignature()), peer)); continue; } - LOGGER.debug(String.format("Imported %s transaction %s from peer %s", transactionData.getType().name(), Base58.encode(transactionData.getSignature()), peer)); + LOGGER.debug(() -> String.format("Imported %s transaction %s from peer %s", transactionData.getType().name(), Base58.encode(transactionData.getSignature()), peer)); // We could collate signatures that are new to us and broadcast them to our peers too newSignatures.add(signature); diff --git a/src/main/java/org/qora/network/Network.java b/src/main/java/org/qora/network/Network.java index b5321812..a5ceced1 100644 --- a/src/main/java/org/qora/network/Network.java +++ b/src/main/java/org/qora/network/Network.java @@ -842,9 +842,6 @@ public class Network extends Thread { try (final Repository repository = RepositoryManager.getRepository()) { List knownPeers = repository.getNetworkRepository().getAllPeers(); - for (PeerData peerData : knownPeers) - LOGGER.trace(String.format("Known peer %s", peerData.getAddress())); - // Filter out duplicates Predicate isKnownAddress = peerAddress -> { return knownPeers.stream().anyMatch(knownPeerData -> knownPeerData.getAddress().equals(peerAddress)); diff --git a/src/main/java/org/qora/network/Peer.java b/src/main/java/org/qora/network/Peer.java index 69aec170..10bd9cdc 100644 --- a/src/main/java/org/qora/network/Peer.java +++ b/src/main/java/org/qora/network/Peer.java @@ -345,7 +345,7 @@ public class Peer extends Thread { return; } - LOGGER.trace(String.format("Received %s message with ID %d from peer %s", message.getType().name(), message.getId(), this)); + LOGGER.trace(() -> String.format("Received %s message with ID %d from peer %s", message.getType().name(), message.getId(), this)); // Find potential blocking queue for this id (expect null if id is -1) BlockingQueue queue = this.replyQueues.get(message.getId()); @@ -401,7 +401,7 @@ public class Peer extends Thread { try { // Send message - LOGGER.trace(String.format("Sending %s message with ID %d to peer %s", message.getType().name(), message.getId(), this)); + LOGGER.trace(() -> String.format("Sending %s message with ID %d to peer %s", message.getType().name(), message.getId(), this)); synchronized (this.out) { this.out.write(message.toBytes()); diff --git a/src/main/java/org/qora/repository/hsqldb/HSQLDBRepository.java b/src/main/java/org/qora/repository/hsqldb/HSQLDBRepository.java index 81d39449..32b895cc 100644 --- a/src/main/java/org/qora/repository/hsqldb/HSQLDBRepository.java +++ b/src/main/java/org/qora/repository/hsqldb/HSQLDBRepository.java @@ -230,7 +230,7 @@ public class HSQLDBRepository implements Repository { */ public PreparedStatement prepareStatement(String sql) throws SQLException { if (this.debugState) - LOGGER.debug(String.format("[%d] %s", this.sessionId, sql)); + LOGGER.debug(() -> String.format("[%d] %s", this.sessionId, sql)); if (this.sqlStatements != null) this.sqlStatements.add(sql);