mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 09:52:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup some log.debug calls

Browse Source
This commit is contained in:
Manfred Karrer 2019-03-05 11:24:07 -05:00
parent 1d0fdf4c55
commit b711f571a4
No known key found for this signature in database
GPG Key ID: 401250966A6B2C46
24 changed files with 149 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/src/main/java/bisq/common/storage/FileManager.java
View File

@ -133,7 +133,6 @@ public class FileManager<T extends PersistableEnvelope> {
}
public synchronized void removeFile(String fileName) {
log.debug("removeFile" + fileName);
File file = new File(dir, fileName);
boolean result = file.delete();
if (!result)

2
core/src/main/java/bisq/core/app/BisqExecutable.java
View File

@ -258,7 +258,7 @@ public abstract class BisqExecutable implements GracefulShutDownHandler, BisqSet
// We need to delay it as the stage is not created yet and so popups would not be shown.
if (DevEnv.isDevMode())
UserThread.runAfter(() -> {
log.error("Error at PersistedDataHost.apply: " + t.toString());
log.error("Error at PersistedDataHost.apply: {}", t.toString());
throw t;
}, 2);
}

3
core/src/main/java/bisq/core/app/misc/AppSetupWithP2P.java
View File

@ -77,7 +77,6 @@ public class AppSetupWithP2P extends AppSetup {
// we apply at startup the reading of persisted data but don't want to get it triggered in the constructor
persistedDataHosts.forEach(e -> {
try {
log.info("call readPersisted at " + e.getClass().getSimpleName());
e.readPersisted();
} catch (Throwable e1) {
log.error("readPersisted error", e1);
@ -120,7 +119,7 @@ public class AppSetupWithP2P extends AppSetup {
if (connection.getPeerType() == Connection.PeerType.SEED_NODE &&
closeConnectionReason == CloseConnectionReason.RULE_VIOLATION) {
log.warn("RULE_VIOLATION onDisconnect closeConnectionReason=" + closeConnectionReason);
log.warn("RULE_VIOLATION onDisconnect connection=" + connection);
log.warn("RULE_VIOLATION onDisconnect connection={}", connection);
}
}

2
core/src/main/java/bisq/core/btc/nodes/SeedPeersSocks5Dns.java
View File

@ -162,7 +162,7 @@ public class SeedPeersSocks5Dns implements PeerDiscovery {
InetAddress addrResolved = proxySocket.getInetAddress();
proxySocket.close();
if (addrResolved != null) {
log.debug("Resolved " + addr.getHostString() + " to " + addrResolved.getHostAddress());
//log.debug("Resolved " + addr.getHostString() + " to " + addrResolved.getHostAddress());
return new InetSocketAddress(addrResolved, addr.getPort());
} else {
// note: .onion nodes fall in here when proxy is Tor. But they have no IP address.

162
core/src/main/java/bisq/core/btc/wallet/TradeWalletService.java
View File

@ -177,14 +177,14 @@ public class TradeWalletService {
boolean doBroadcast,
@Nullable TxBroadcaster.Callback callback)
throws InsufficientMoneyException, AddressFormatException {
log.debug("fundingAddress " + fundingAddress.toString());
log.debug("reservedForTradeAddress " + reservedForTradeAddress.toString());
log.debug("changeAddress " + changeAddress.toString());
log.info("reservedFundsForOffer " + reservedFundsForOffer.toPlainString());
log.debug("useSavingsWallet " + useSavingsWallet);
log.info("tradingFee " + tradingFee.toPlainString());
log.info("txFee " + txFee.toPlainString());
log.debug("feeReceiverAddresses " + feeReceiverAddresses);
log.debug("fundingAddress {}", fundingAddress.toString());
log.debug("reservedForTradeAddress {}", reservedForTradeAddress.toString());
log.debug("changeAddress {}", changeAddress.toString());
log.info("reservedFundsForOffer {}", reservedFundsForOffer.toPlainString());
log.debug("useSavingsWallet {}", useSavingsWallet);
log.info("tradingFee {}", tradingFee.toPlainString());
log.info("txFee {}", txFee.toPlainString());
log.debug("feeReceiverAddresses {}", feeReceiverAddresses);
Transaction tradingFeeTx = new Transaction(params);
SendRequest sendRequest = null;
try {
@ -240,12 +240,12 @@ public class TradeWalletService {
TransactionVerificationException, WalletException,
InsufficientMoneyException, AddressFormatException {
log.debug("preparedBsqTx " + preparedBsqTx.toString());
log.debug("fundingAddress " + fundingAddress.toString());
log.debug("changeAddress " + changeAddress.toString());
log.debug("reservedFundsForOffer " + reservedFundsForOffer.toPlainString());
log.debug("useSavingsWallet " + useSavingsWallet);
log.debug("txFee " + txFee.toPlainString());
log.debug("preparedBsqTx {}", preparedBsqTx.toString());
log.debug("fundingAddress {}", fundingAddress.toString());
log.debug("changeAddress {}", changeAddress.toString());
log.debug("reservedFundsForOffer {}", reservedFundsForOffer.toPlainString());
log.debug("useSavingsWallet {}", useSavingsWallet);
log.debug("txFee {}", txFee.toPlainString());
// preparedBsqTx has following structure:
// inputs [1-n] BSQ inputs
@ -337,9 +337,9 @@ public class TradeWalletService {
public InputsAndChangeOutput takerCreatesDepositsTxInputs(Transaction takeOfferFeeTx, Coin inputAmount, Coin txFee, Address takersAddress) throws
TransactionVerificationException {
log.debug("takerCreatesDepositsTxInputs called");
log.debug("inputAmount " + inputAmount.toFriendlyString());
log.debug("txFee " + txFee.toFriendlyString());
log.debug("takersAddress " + takersAddress.toString());
log.debug("inputAmount {}", inputAmount.toFriendlyString());
log.debug("txFee {}", txFee.toFriendlyString());
log.debug("takersAddress {}", takersAddress.toString());
// We add the mining fee 2 times to the deposit tx:
// 1. Will be spent when publishing the deposit tx (paid by buyer)
@ -430,17 +430,17 @@ public class TradeWalletService {
byte[] arbitratorPubKey)
throws SigningException, TransactionVerificationException, WalletException, AddressFormatException {
log.debug("makerCreatesAndSignsDepositTx called");
log.debug("makerIsBuyer " + makerIsBuyer);
log.debug("makerInputAmount " + makerInputAmount.toFriendlyString());
log.debug("msOutputAmount " + msOutputAmount.toFriendlyString());
log.debug("takerRawInputs " + takerRawTransactionInputs.toString());
log.debug("takerChangeOutputValue " + takerChangeOutputValue);
log.debug("takerChangeAddressString " + takerChangeAddressString);
log.debug("makerAddress " + makerAddress);
log.debug("makerChangeAddress " + makerChangeAddress);
log.debug("buyerPubKey " + ECKey.fromPublicOnly(buyerPubKey).toString());
log.debug("sellerPubKey " + ECKey.fromPublicOnly(sellerPubKey).toString());
log.debug("arbitratorPubKey " + ECKey.fromPublicOnly(arbitratorPubKey).toString());
log.debug("makerIsBuyer {}", makerIsBuyer);
log.debug("makerInputAmount {}", makerInputAmount.toFriendlyString());
log.debug("msOutputAmount {}", msOutputAmount.toFriendlyString());
log.debug("takerRawInputs {}", takerRawTransactionInputs.toString());
log.debug("takerChangeOutputValue {}", takerChangeOutputValue);
log.debug("takerChangeAddressString {}", takerChangeAddressString);
log.debug("makerAddress {}", makerAddress);
log.debug("makerChangeAddress {}", makerChangeAddress);
log.debug("buyerPubKey {}", ECKey.fromPublicOnly(buyerPubKey).toString());
log.debug("sellerPubKey {}", ECKey.fromPublicOnly(sellerPubKey).toString());
log.debug("arbitratorPubKey {}", ECKey.fromPublicOnly(arbitratorPubKey).toString());
checkArgument(!takerRawTransactionInputs.isEmpty());
@ -574,13 +574,13 @@ public class TradeWalletService {
Transaction makersDepositTx = new Transaction(params, makersDepositTxSerialized);
log.debug("signAndPublishDepositTx called");
log.debug("takerIsSeller " + takerIsSeller);
log.debug("makersDepositTx " + makersDepositTx.toString());
log.debug("buyerConnectedOutputsForAllInputs " + buyerInputs.toString());
log.debug("sellerConnectedOutputsForAllInputs " + sellerInputs.toString());
log.debug("buyerPubKey " + ECKey.fromPublicOnly(buyerPubKey).toString());
log.debug("sellerPubKey " + ECKey.fromPublicOnly(sellerPubKey).toString());
log.debug("arbitratorPubKey " + ECKey.fromPublicOnly(arbitratorPubKey).toString());
log.debug("takerIsSeller {}", takerIsSeller);
log.debug("makersDepositTx {}", makersDepositTx.toString());
log.debug("buyerConnectedOutputsForAllInputs {}", buyerInputs.toString());
log.debug("sellerConnectedOutputsForAllInputs {}", sellerInputs.toString());
log.debug("buyerPubKey {}", ECKey.fromPublicOnly(buyerPubKey).toString());
log.debug("sellerPubKey {}", ECKey.fromPublicOnly(sellerPubKey).toString());
log.debug("arbitratorPubKey {}", ECKey.fromPublicOnly(arbitratorPubKey).toString());
checkArgument(!buyerInputs.isEmpty());
checkArgument(!sellerInputs.isEmpty());
@ -618,9 +618,9 @@ public class TradeWalletService {
// Check if OP_RETURN output with contract hash matches the one from the maker
TransactionOutput contractHashOutput = new TransactionOutput(params, makersDepositTx, Coin.ZERO,
ScriptBuilder.createOpReturnScript(contractHash).getProgram());
log.debug("contractHashOutput " + contractHashOutput);
log.debug("contractHashOutput {}", contractHashOutput);
TransactionOutput makersContractHashOutput = makersDepositTx.getOutputs().get(1);
log.debug("makersContractHashOutput " + makersContractHashOutput);
log.debug("makersContractHashOutput {}", makersContractHashOutput);
if (!makersContractHashOutput.getScriptPubKey().equals(contractHashOutput.getScriptPubKey()))
throw new TransactionVerificationException("Maker's transaction output for the contract hash is not matching takers version.");
@ -675,11 +675,11 @@ public class TradeWalletService {
byte[] arbitratorPubKey)
throws AddressFormatException, TransactionVerificationException {
log.trace("sellerSignsPayoutTx called");
log.trace("depositTx " + depositTx.toString());
log.trace("buyerPayoutAmount " + buyerPayoutAmount.toFriendlyString());
log.trace("sellerPayoutAmount " + sellerPayoutAmount.toFriendlyString());
log.trace("buyerPayoutAddressString " + buyerPayoutAddressString);
log.trace("sellerPayoutAddressString " + sellerPayoutAddressString);
log.trace("depositTx {}", depositTx.toString());
log.trace("buyerPayoutAmount {}", buyerPayoutAmount.toFriendlyString());
log.trace("sellerPayoutAmount {}", sellerPayoutAmount.toFriendlyString());
log.trace("buyerPayoutAddressString {}", buyerPayoutAddressString);
log.trace("sellerPayoutAddressString {}", sellerPayoutAddressString);
log.trace("multiSigKeyPair (not displayed for security reasons)");
log.info("buyerPubKey HEX=" + ECKey.fromPublicOnly(buyerPubKey).getPublicKeyAsHex());
log.info("sellerPubKey HEX=" + ECKey.fromPublicOnly(sellerPubKey).getPublicKeyAsHex());
@ -737,17 +737,17 @@ public class TradeWalletService {
byte[] arbitratorPubKey)
throws AddressFormatException, TransactionVerificationException, WalletException {
log.trace("buyerSignsAndFinalizesPayoutTx called");
log.trace("depositTx " + depositTx.toString());
log.trace("buyerSignature r " + ECKey.ECDSASignature.decodeFromDER(buyerSignature).r.toString());
log.trace("buyerSignature s " + ECKey.ECDSASignature.decodeFromDER(buyerSignature).s.toString());
log.trace("buyerPayoutAmount " + buyerPayoutAmount.toFriendlyString());
log.trace("sellerPayoutAmount " + sellerPayoutAmount.toFriendlyString());
log.trace("buyerPayoutAddressString " + buyerPayoutAddressString);
log.trace("sellerPayoutAddressString " + sellerPayoutAddressString);
log.trace("depositTx {}", depositTx.toString());
log.trace("buyerSignature r {}", ECKey.ECDSASignature.decodeFromDER(buyerSignature).r.toString());
log.trace("buyerSignature s {}", ECKey.ECDSASignature.decodeFromDER(buyerSignature).s.toString());
log.trace("buyerPayoutAmount {}", buyerPayoutAmount.toFriendlyString());
log.trace("sellerPayoutAmount {}", sellerPayoutAmount.toFriendlyString());
log.trace("buyerPayoutAddressString {}", buyerPayoutAddressString);
log.trace("sellerPayoutAddressString {}", sellerPayoutAddressString);
log.trace("multiSigKeyPair (not displayed for security reasons)");
log.info("buyerPubKey " + ECKey.fromPublicOnly(buyerPubKey).toString());
log.info("sellerPubKey " + ECKey.fromPublicOnly(sellerPubKey).toString());
log.info("arbitratorPubKey " + ECKey.fromPublicOnly(arbitratorPubKey).toString());
log.info("buyerPubKey {}", ECKey.fromPublicOnly(buyerPubKey).toString());
log.info("sellerPubKey {}", ECKey.fromPublicOnly(sellerPubKey).toString());
log.info("arbitratorPubKey {}", ECKey.fromPublicOnly(arbitratorPubKey).toString());
Transaction payoutTx = createPayoutTx(depositTx,
buyerPayoutAmount,
@ -817,15 +817,15 @@ public class TradeWalletService {
throws AddressFormatException, TransactionVerificationException {
Transaction depositTx = new Transaction(params, depositTxSerialized);
log.trace("signDisputedPayoutTx called");
log.trace("depositTx " + depositTx.toString());
log.trace("buyerPayoutAmount " + buyerPayoutAmount.toFriendlyString());
log.trace("sellerPayoutAmount " + sellerPayoutAmount.toFriendlyString());
log.trace("buyerAddressString " + buyerAddressString);
log.trace("sellerAddressString " + sellerAddressString);
log.trace("depositTx {}", depositTx.toString());
log.trace("buyerPayoutAmount {}", buyerPayoutAmount.toFriendlyString());
log.trace("sellerPayoutAmount {}", sellerPayoutAmount.toFriendlyString());
log.trace("buyerAddressString {}", buyerAddressString);
log.trace("sellerAddressString {}", sellerAddressString);
log.trace("arbitratorKeyPair (not displayed for security reasons)");
log.info("buyerPubKey " + ECKey.fromPublicOnly(buyerPubKey).toString());
log.info("sellerPubKey " + ECKey.fromPublicOnly(sellerPubKey).toString());
log.info("arbitratorPubKey " + ECKey.fromPublicOnly(arbitratorPubKey).toString());
log.info("buyerPubKey {}", ECKey.fromPublicOnly(buyerPubKey).toString());
log.info("sellerPubKey {}", ECKey.fromPublicOnly(sellerPubKey).toString());
log.info("arbitratorPubKey {}", ECKey.fromPublicOnly(arbitratorPubKey).toString());
// Our MS is index 0
TransactionOutput p2SHMultiSigOutput = depositTx.getOutput(0);
@ -884,17 +884,17 @@ public class TradeWalletService {
Transaction depositTx = new Transaction(params, depositTxSerialized);
log.trace("signAndFinalizeDisputedPayoutTx called");
log.trace("depositTx " + depositTx);
log.trace("arbitratorSignature r " + ECKey.ECDSASignature.decodeFromDER(arbitratorSignature).r.toString());
log.trace("arbitratorSignature s " + ECKey.ECDSASignature.decodeFromDER(arbitratorSignature).s.toString());
log.trace("buyerPayoutAmount " + buyerPayoutAmount.toFriendlyString());
log.trace("sellerPayoutAmount " + sellerPayoutAmount.toFriendlyString());
log.trace("buyerAddressString " + buyerAddressString);
log.trace("sellerAddressString " + sellerAddressString);
log.trace("depositTx {}", depositTx);
log.trace("arbitratorSignature r {}", ECKey.ECDSASignature.decodeFromDER(arbitratorSignature).r.toString());
log.trace("arbitratorSignature s {}", ECKey.ECDSASignature.decodeFromDER(arbitratorSignature).s.toString());
log.trace("buyerPayoutAmount {}", buyerPayoutAmount.toFriendlyString());
log.trace("sellerPayoutAmount {}", sellerPayoutAmount.toFriendlyString());
log.trace("buyerAddressString {}", buyerAddressString);
log.trace("sellerAddressString {}", sellerAddressString);
log.trace("tradersMultiSigKeyPair (not displayed for security reasons)");
log.info("buyerPubKey " + ECKey.fromPublicOnly(buyerPubKey).toString());
log.info("sellerPubKey " + ECKey.fromPublicOnly(sellerPubKey).toString());
log.info("arbitratorPubKey " + ECKey.fromPublicOnly(arbitratorPubKey).toString());
log.info("buyerPubKey {}", ECKey.fromPublicOnly(buyerPubKey).toString());
log.info("sellerPubKey {}", ECKey.fromPublicOnly(sellerPubKey).toString());
log.info("arbitratorPubKey {}", ECKey.fromPublicOnly(arbitratorPubKey).toString());
TransactionOutput p2SHMultiSigOutput = depositTx.getOutput(0);
@ -953,20 +953,20 @@ public class TradeWalletService {
TxBroadcaster.Callback callback)
throws AddressFormatException, TransactionVerificationException, WalletException {
log.info("signAndPublishPayoutTx called");
log.info("depositTxHex " + depositTxHex);
log.info("buyerPayoutAmount " + buyerPayoutAmount.toFriendlyString());
log.info("sellerPayoutAmount " + sellerPayoutAmount.toFriendlyString());
log.info("arbitratorPayoutAmount " + arbitratorPayoutAmount.toFriendlyString());
log.info("buyerAddressString " + buyerAddressString);
log.info("sellerAddressString " + sellerAddressString);
log.info("arbitratorAddressString " + arbitratorAddressString);
log.info("depositTxHex {}", depositTxHex);
log.info("buyerPayoutAmount {}", buyerPayoutAmount.toFriendlyString());
log.info("sellerPayoutAmount {}", sellerPayoutAmount.toFriendlyString());
log.info("arbitratorPayoutAmount {}", arbitratorPayoutAmount.toFriendlyString());
log.info("buyerAddressString {}", buyerAddressString);
log.info("sellerAddressString {}", sellerAddressString);
log.info("arbitratorAddressString {}", arbitratorAddressString);
log.info("buyerPrivateKeyAsHex (not displayed for security reasons)");
log.info("sellerPrivateKeyAsHex (not displayed for security reasons)");
log.info("arbitratorPrivateKeyAsHex (not displayed for security reasons)");
log.info("buyerPubKeyAsHex " + buyerPubKeyAsHex);
log.info("sellerPubKeyAsHex " + sellerPubKeyAsHex);
log.info("arbitratorPubKeyAsHex " + arbitratorPubKeyAsHex);
log.info("P2SHMultiSigOutputScript " + P2SHMultiSigOutputScript);
log.info("buyerPubKeyAsHex {}", buyerPubKeyAsHex);
log.info("sellerPubKeyAsHex {}", sellerPubKeyAsHex);
log.info("arbitratorPubKeyAsHex {}", arbitratorPubKeyAsHex);
log.info("P2SHMultiSigOutputScript {}", P2SHMultiSigOutputScript);
checkNotNull((buyerPrivateKeyAsHex != null || sellerPrivateKeyAsHex != null), "either buyerPrivateKeyAsHex or sellerPrivateKeyAsHex must not be null");

4
core/src/main/java/bisq/core/filter/FilterManager.java
View File

@ -257,7 +257,7 @@ public class FilterManager {
boolean result = p2PService.addProtectedStorageEntry(filter, true);
if (result)
log.trace("Add filter to network was successful. FilterMessage = " + filter);
log.trace("Add filter to network was successful. FilterMessage = {}", filter);
}
return isKeyValid;
@ -269,7 +269,7 @@ public class FilterManager {
if (filter == null) {
log.warn("Developers filter is null");
} else if (p2PService.removeData(filter, true)) {
log.trace("Remove filter from network was successful. FilterMessage = " + filter);
log.trace("Remove filter from network was successful. FilterMessage = {}", filter);
user.setDevelopersFilter(null);
} else {
log.warn("Filter remove failed");

2
core/src/main/java/bisq/core/locale/CurrencyUtil.java
View File

@ -383,7 +383,7 @@ public class CurrencyUtil {
try {
return Currency.getInstance(currencyCode).getDisplayName();
} catch (Throwable t) {
log.debug("No currency name available " + t.getMessage());
log.debug("No currency name available {}", t.getMessage());
return currencyCode;
}
}

2
core/src/main/java/bisq/core/locale/Res.java
View File

@ -115,7 +115,7 @@ public class Res {
.replace("Bitcoin", baseCurrencyName)
.replace("bitcoin", baseCurrencyNameLowerCase);
} catch (MissingResourceException e) {
log.warn("Missing resource for key: " + key);
log.warn("Missing resource for key: {}", key);
e.printStackTrace();
if (DevEnv.isDevMode())
UserThread.runAfter(() -> {

2
core/src/main/java/bisq/core/payment/AccountAgeWitnessService.java
View File

@ -329,7 +329,7 @@ public class AccountAgeWitnessService {
// Check if the peers trade limit is not less than the trade amount
if (!verifyPeersTradeLimit(trade, peersWitness, peersCurrentDate, errorMessageHandler)) {
log.error("verifyPeersTradeLimit failed: peersPaymentAccountPayload " + peersPaymentAccountPayload);
log.error("verifyPeersTradeLimit failed: peersPaymentAccountPayload {}", peersPaymentAccountPayload);
return false;
}
// Check if the signature is correct

7
core/src/main/java/bisq/core/trade/protocol/TradeProtocol.java
View File

@ -111,7 +111,6 @@ public abstract class TradeProtocol {
}
private void cleanup() {
log.debug("cleanup " + this);
stopTimeout();
trade.stateProperty().removeListener(stateChangeListener);
// We removed that from here earlier as it broke the trade process in some non critical error cases.
@ -120,7 +119,7 @@ public abstract class TradeProtocol {
}
public void applyMailboxMessage(DecryptedMessageWithPubKey decryptedMessageWithPubKey, Trade trade) {
log.debug("applyMailboxMessage " + decryptedMessageWithPubKey.getNetworkEnvelope());
log.debug("applyMailboxMessage {}", decryptedMessageWithPubKey.getNetworkEnvelope());
if (processModel.getTradingPeer().getPubKeyRing() != null &&
decryptedMessageWithPubKey.getSignaturePubKey().equals(processModel.getTradingPeer().getPubKeyRing().getSignaturePubKey())) {
processModel.setDecryptedMessageWithPubKey(decryptedMessageWithPubKey);
@ -157,7 +156,7 @@ public abstract class TradeProtocol {
}
protected void handleTaskRunnerSuccess(@Nullable TradeMessage tradeMessage, String info) {
log.debug("handleTaskRunnerSuccess " + info);
log.debug("handleTaskRunnerSuccess {}", info);
sendAckMessage(tradeMessage, true, null);
}
@ -231,7 +230,7 @@ public abstract class TradeProtocol {
private void cleanupTradableOnFault() {
final Trade.State state = trade.getState();
log.warn("cleanupTradableOnFault tradeState=" + state);
log.warn("cleanupTradableOnFault tradeState={}", state);
TradeManager tradeManager = processModel.getTradeManager();
if (trade.isInPreparation()) {
// no funds left. we just clean up the trade list

1
core/src/main/java/bisq/core/trade/protocol/tasks/taker/TakerPublishFeeTx.java
View File

@ -80,7 +80,6 @@ public class TakerPublishFeeTx extends TradeTask {
public void onSuccess(@Nullable Transaction transaction) {
if (!completed) {
if (transaction != null) {
log.debug("Successfully sent tx with id " + transaction.getHashAsString());
trade.setTakerFeeTxId(transaction.getHashAsString());
processModel.setTakeOfferFeeTx(transaction);
trade.setState(Trade.State.TAKER_PUBLISHED_TAKER_FEE_TX);

2
desktop/src/main/java/bisq/desktop/main/dao/wallet/send/BsqSendView.java
View File

@ -353,7 +353,7 @@ public class BsqSendView extends ActivatableView<GridPane, Void> implements BsqB
walletsManager.publishAndCommitBsqTx(txWithBtcFee, txType, new TxBroadcaster.Callback() {
@Override
public void onSuccess(Transaction transaction) {
log.debug("Successfully sent tx with id " + txWithBtcFee.getHashAsString());
log.debug("Successfully sent tx with id {}", txWithBtcFee.getHashAsString());
}
@Override

2
desktop/src/main/java/bisq/desktop/main/funds/withdrawal/WithdrawalView.java
View File

@ -352,7 +352,7 @@ public class WithdrawalView extends ActivatableView<VBox, Void> {
@Override
public void onSuccess(@javax.annotation.Nullable Transaction transaction) {
if (transaction != null) {
log.debug("onWithdraw onSuccess tx ID:" + transaction.getHashAsString());
log.debug("onWithdraw onSuccess tx ID:{}", transaction.getHashAsString());
} else {
log.error("onWithdraw transaction is null");
}

2
desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBook.java
View File

@ -113,7 +113,7 @@ public class OfferBook {
.map(OfferBookListItem::new)
.collect(Collectors.toList()));
log.debug("offerBookListItems.size " + offerBookListItems.size());
log.debug("offerBookListItems.size {}", offerBookListItems.size());
fillOfferCountMaps();
} catch (Throwable t) {
t.printStackTrace();

2
desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferDataModel.java
View File

@ -488,7 +488,7 @@ class TakeOfferDataModel extends OfferDataModel {
totalToPayAsCoin.set(feeAndSecDeposit);
updateBalance();
log.debug("totalToPayAsCoin " + totalToPayAsCoin.get().toFriendlyString());
log.debug("totalToPayAsCoin {}", totalToPayAsCoin.get().toFriendlyString());
}
}

3
desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferViewModel.java
View File

@ -380,7 +380,6 @@ class TakeOfferViewModel extends ActivatableWithDataModel<TakeOfferDataModel> im
///////////////////////////////////////////////////////////////////////////////////////////
private void applyOfferState(Offer.State state) {
log.debug("applyOfferState state = " + state);
offerWarning.set(null);
// We have 2 situations handled here:
@ -459,8 +458,6 @@ class TakeOfferViewModel extends ActivatableWithDataModel<TakeOfferDataModel> im
}
private void applyTradeState(Trade.State tradeState) {
log.debug("applyTradeState state = " + tradeState);
if (trade.isDepositPublished()) {
if (trade.getDepositTx() != null) {
if (takeOfferSucceededHandler != null)

2
desktop/src/main/java/bisq/desktop/main/overlays/windows/EmptyWalletWindow.java
View File

@ -238,7 +238,7 @@ public class EmptyWalletWindow extends Overlay<EmptyWalletWindow> {
},
(errorMessage) -> {
emptyWalletButton.setDisable(false);
log.debug("wallet empty failed " + errorMessage);
log.error("wallet empty failed {}", errorMessage);
});
} catch (InsufficientMoneyException | AddressFormatException e1) {
e1.printStackTrace();

2
desktop/src/main/java/bisq/desktop/main/overlays/windows/downloadupdate/BisqInstaller.java
View File

@ -308,7 +308,7 @@ public class BisqInstaller {
.loadUrl(installerFileDescriptor.getLoadUrl().concat(suffix))
.build());
} else {
log.debug("We have already a file with the key: " + key.getId());
log.debug("We have already a file with the key: {}", key.getId());
}
}
return result;

31
monitor/src/main/java/bisq/monitor/metric/P2PRoundTripTime.java
View File

@ -17,18 +17,6 @@
package bisq.monitor.metric;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import org.jetbrains.annotations.NotNull;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.SettableFuture;
import bisq.common.proto.network.NetworkEnvelope;
import bisq.core.proto.network.CoreNetworkProtoResolver;
import bisq.monitor.AvailableTor;
import bisq.monitor.Metric;
import bisq.monitor.Monitor;
@ -36,6 +24,9 @@ import bisq.monitor.OnionParser;
import bisq.monitor.Reporter;
import bisq.monitor.StatisticsHelper;
import bisq.monitor.ThreadGate;
import bisq.core.proto.network.CoreNetworkProtoResolver;
import bisq.network.p2p.CloseConnectionMessage;
import bisq.network.p2p.NodeAddress;
import bisq.network.p2p.network.CloseConnectionReason;
@ -46,8 +37,23 @@ import bisq.network.p2p.network.SetupListener;
import bisq.network.p2p.network.TorNetworkNode;
import bisq.network.p2p.peers.keepalive.messages.Ping;
import bisq.network.p2p.peers.keepalive.messages.Pong;
import bisq.common.proto.network.NetworkEnvelope;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.SettableFuture;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import lombok.extern.slf4j.Slf4j;
import org.jetbrains.annotations.NotNull;
@Slf4j
public class P2PRoundTripTime extends Metric implements MessageListener, SetupListener {
@ -107,7 +113,6 @@ public class P2PRoundTripTime extends Metric implements MessageListener, SetupLi
@Override
public void onSuccess(Connection connection) {
connection.addMessageListener(P2PRoundTripTime.this);
log.debug("Send ping to " + connection + " succeeded.");
}
@Override

47
monitor/src/main/java/bisq/monitor/metric/P2PSeedNodeSnapshot.java
View File

@ -17,31 +17,15 @@
package bisq.monitor.metric;
import static com.google.common.base.Preconditions.checkNotNull;
import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import java.util.Random;
import java.util.Set;
import java.util.TreeSet;
import java.util.concurrent.ConcurrentHashMap;
import org.jetbrains.annotations.NotNull;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.SettableFuture;
import bisq.common.proto.network.NetworkEnvelope;
import bisq.core.proto.network.CoreNetworkProtoResolver;
import bisq.monitor.AvailableTor;
import bisq.monitor.Metric;
import bisq.monitor.Monitor;
import bisq.monitor.OnionParser;
import bisq.monitor.Reporter;
import bisq.monitor.ThreadGate;
import bisq.core.proto.network.CoreNetworkProtoResolver;
import bisq.network.p2p.CloseConnectionMessage;
import bisq.network.p2p.NodeAddress;
import bisq.network.p2p.network.CloseConnectionReason;
@ -56,16 +40,38 @@ import bisq.network.p2p.storage.payload.PersistableNetworkPayload;
import bisq.network.p2p.storage.payload.ProtectedStorageEntry;
import bisq.network.p2p.storage.payload.ProtectedStoragePayload;
import bisq.common.proto.network.NetworkEnvelope;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.SettableFuture;
import java.net.MalformedURLException;
import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import java.util.Random;
import java.util.Set;
import java.util.TreeSet;
import java.util.concurrent.ConcurrentHashMap;
import lombok.extern.slf4j.Slf4j;
import org.jetbrains.annotations.NotNull;
import static com.google.common.base.Preconditions.checkNotNull;
/**
* Contacts a list of hosts and asks them for all the data excluding persisted messages. The
* answers are then compiled into buckets of message types. Based on these
* buckets, the Metric reports (for each host) the message types observed and
* their number.
*
*
* @author Florian Reimair
*
*/
@ -191,7 +197,6 @@ public class P2PSeedNodeSnapshot extends Metric implements MessageListener, Setu
@Override
public void onSuccess(Connection connection) {
connection.addMessageListener(P2PSeedNodeSnapshot.this);
log.debug("Send PreliminaryDataRequest to " + connection + " succeeded.");
}
@Override

2
p2p/src/main/java/bisq/network/p2p/network/Connection.java
View File

@ -797,7 +797,7 @@ public class Connection implements MessageListener {
}
Connection connection = checkNotNull(sharedModel.connection, "connection must not be null");
log.trace("InputHandler waiting for incoming network_messages.\n\tConnection=" + connection);
log.trace("InputHandler waiting for incoming network_messages.\n\tConnection={}", connection);
// Throttle inbound network_messages
long now = System.currentTimeMillis();

4
p2p/src/main/java/bisq/network/p2p/network/Server.java
View File

@ -74,8 +74,8 @@ class Server implements Runnable {
log.debug("\n\n%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n" +
"Server created new inbound connection:"
+ "\nlocalPort/port=" + serverSocket.getLocalPort()
+ "/" + socket.getPort()
+ "\nconnection.uid=" + connection.getUid()
+ "/{}" +
"\nconnection.uid={}", socket.getPort(), connection.getUid()
+ "\n%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n");
if (!stopped)

6
p2p/src/main/java/bisq/network/p2p/peers/PeerManager.java
View File

@ -345,7 +345,7 @@ public class PeerManager implements ConnectionListener, PersistedDataHost {
candidates.sort((o1, o2) -> ((Long) o1.getStatistic().getLastActivityTimestamp()).compareTo(((Long) o2.getStatistic().getLastActivityTimestamp())));
Connection connection = candidates.remove(0);
log.info("checkMaxConnections: Num candidates for shut down={}. We close oldest connection: {}", candidates.size(), connection);
log.debug("We are going to shut down the oldest connection.\n\tconnection=" + connection.toString());
log.debug("We are going to shut down the oldest connection.\n\tconnection={}", connection.toString());
if (!connection.isStopped())
connection.shutDown(CloseConnectionReason.TOO_MANY_CONNECTIONS_OPEN, () -> UserThread.runAfter(this::checkMaxConnections, 100, TimeUnit.MILLISECONDS));
return true;
@ -370,7 +370,7 @@ public class PeerManager implements ConnectionListener, PersistedDataHost {
// because he needs longer for the HS publishing
if (!connection.hasPeersNodeAddress() && !connection.isStopped()) {
log.debug("We close the connection as the peer address is still unknown.\n\t" +
"connection=" + connection);
"connection={}", connection);
connection.shutDown(CloseConnectionReason.UNKNOWN_PEER_ADDRESS);
}
}, REMOVE_ANONYMOUS_PEER_SEC));
@ -386,7 +386,7 @@ public class PeerManager implements ConnectionListener, PersistedDataHost {
seedNodes.sort((o1, o2) -> ((Long) o1.getStatistic().getLastActivityTimestamp()).compareTo(((Long) o2.getStatistic().getLastActivityTimestamp())));
log.debug("Number of seed node connections to disconnect. Current size=" + seedNodes.size());
Connection connection = seedNodes.get(0);
log.debug("We are going to shut down the oldest connection.\n\tconnection=" + connection.toString());
log.debug("We are going to shut down the oldest connection.\n\tconnection={}", connection.toString());
connection.shutDown(CloseConnectionReason.TOO_MANY_SEED_NODES_CONNECTED,
() -> UserThread.runAfter(this::removeSuperfluousSeedNodes, 200, TimeUnit.MILLISECONDS));
}

4
p2p/src/main/java/bisq/network/p2p/storage/P2PDataStorage.java
View File

@ -594,7 +594,6 @@ public class P2PDataStorage implements MessageListener, ConnectionListener, Pers
return false;
}
} else {
log.trace("Sequence number is valid (!sequenceNumberMap.containsKey(hashOfData)). sequenceNumber = " + newSequenceNumber);
return true;
}
}
@ -624,7 +623,6 @@ public class P2PDataStorage implements MessageListener, ConnectionListener, Pers
return false;
}
} else {
log.trace("Sequence number has increased (!sequenceNumberMap.containsKey(hashOfData)). sequenceNumber = " + newSequenceNumber + " / hashOfData=" + hashOfData.toString());
return true;
}
}
@ -768,7 +766,7 @@ public class P2PDataStorage implements MessageListener, ConnectionListener, Pers
});
sb.append("\n------------------------------------------------------------\n");
log.debug(sb.toString());
log.debug("Data set " + info + " operation: size=" + map.values().size());
//log.debug("Data set " + info + " operation: size=" + map.values().size());
}
}