Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-05-20 07:20:41 -04:00
Code Issues Projects Releases Packages Wiki Activity

Add param for using mailbox if msg send failes

Browse source
This commit is contained in:
Manfred Karrer 2015-05-20 00:38:52 +02:00
parent f971a787ba
commit 5cc6c5c552
12 changed files with 31 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/src/main/java/io/bitsquare/p2p/MessageService.java
View file

@ -23,7 +23,7 @@ import io.bitsquare.p2p.listener.SendMessageListener;
public interface MessageService extends P2PService {
void sendEncryptedMessage(Peer peer, PubKeyRing pubKeyRing, Message message, SendMessageListener listener);
void sendEncryptedMessage(Peer peer, PubKeyRing pubKeyRing, Message message, boolean useMailboxIfUnreachable, SendMessageListener listener);
void addMessageHandler(MessageHandler listener);

5
core/src/main/java/io/bitsquare/p2p/tomp2p/BootstrappedPeerBuilder.java
View file

@ -200,7 +200,10 @@ public class BootstrappedPeerBuilder {
peer.peerBean().peerMap().addPeerMapChangeListener(new PeerMapChangeListener() {
@Override
public void peerInserted(PeerAddress peerAddress, boolean verified) {
log.debug("Peer inserted: peerAddress=" + peerAddress + ", verified=" + verified);
if (verified)
log.debug("Peer inserted: peerAddress=" + peerAddress + ", verified=" + verified);
else
log.trace("Peer inserted: peerAddress=" + peerAddress + ", verified=" + verified);
}
@Override

20
core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PMessageService.java
View file

@ -72,7 +72,7 @@ public class TomP2PMessageService extends TomP2PService implements MessageServic
}
@Override
public void sendEncryptedMessage(Peer peer, PubKeyRing pubKeyRing, Message message, SendMessageListener listener) {
public void sendEncryptedMessage(Peer peer, PubKeyRing pubKeyRing, Message message, boolean useMailboxIfUnreachable, SendMessageListener listener) {
assert pubKeyRing != null;
log.debug("sendMessage called");
@ -97,7 +97,14 @@ public class TomP2PMessageService extends TomP2PService implements MessageServic
else {
log.info("sendMessage failed. We will try to send the message to the mailbox. Fault reason: " +
futureDirect.failedReason());
sendMailboxMessage(pubKeyRing, (SealedAndSignedMessage) encryptedMessage, listener);
if (useMailboxIfUnreachable) {
sendMailboxMessage(pubKeyRing, (SealedAndSignedMessage) encryptedMessage, listener);
}
else {
openRequestsDown();
log.error("Send message was not successful");
executor.execute(listener::handleFault);
}
}
}
@ -105,7 +112,14 @@ public class TomP2PMessageService extends TomP2PService implements MessageServic
public void exceptionCaught(Throwable t) throws Exception {
log.info("sendMessage failed with exception. We will try to send the message to the mailbox. Exception: "
+ t.getMessage());
sendMailboxMessage(pubKeyRing, (SealedAndSignedMessage) encryptedMessage, listener);
if (useMailboxIfUnreachable) {
sendMailboxMessage(pubKeyRing, (SealedAndSignedMessage) encryptedMessage, listener);
}
else {
openRequestsDown();
log.error("Send message was not successful");
executor.execute(listener::handleFault);
}
}
}
);

1
core/src/main/java/io/bitsquare/trade/offer/OpenOfferManager.java
View file

@ -268,6 +268,7 @@ public class OpenOfferManager {
messageService.sendEncryptedMessage(sender,
message.getPubKeyRing(),
offerAvailabilityResponse,
false,
new SendMessageListener() {
@Override
public void handleResult() {

1
core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/SendOfferAvailabilityRequest.java
View file

@ -42,6 +42,7 @@ public class SendOfferAvailabilityRequest extends Task<OfferAvailabilityModel> {
model.messageService.sendEncryptedMessage(model.getPeer(),
model.offer.getPubKeyRing(),
message,
false,
new SendMessageListener() {
@Override
public void handleResult() {

1
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SendDepositTxPublishedMessage.java
View file

@ -44,6 +44,7 @@ public class SendDepositTxPublishedMessage extends TradeTask {
trade.getTradingPeer(),
processModel.tradingPeer.getPubKeyRing(),
tradeMessage,
true,
new SendMessageListener() {
@Override
public void handleResult() {

1
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SendFiatTransferStartedMessage.java
View file

@ -46,6 +46,7 @@ public class SendFiatTransferStartedMessage extends TradeTask {
trade.getTradingPeer(),
processModel.tradingPeer.getPubKeyRing(),
tradeMessage,
true,
new SendMessageListener() {
@Override
public void handleResult() {

1
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SendPayDepositRequest.java
View file

@ -55,6 +55,7 @@ public class SendPayDepositRequest extends TradeTask {
trade.getTradingPeer(),
processModel.tradingPeer.getPubKeyRing(),
tradeMessage,
false,
new SendMessageListener() {
@Override
public void handleResult() {

1
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SendPayoutTxFinalizedMessage.java
View file

@ -43,6 +43,7 @@ public class SendPayoutTxFinalizedMessage extends TradeTask {
trade.getTradingPeer(),
processModel.tradingPeer.getPubKeyRing(),
tradeMessage,
true,
new SendMessageListener() {
@Override
public void handleResult() {

1
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SendDepositTxInputsRequest.java
View file

@ -53,6 +53,7 @@ public class SendDepositTxInputsRequest extends TradeTask {
trade.getTradingPeer(),
processModel.tradingPeer.getPubKeyRing(),
message,
false,
new SendMessageListener() {
@Override
public void handleResult() {

1
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SendFinalizePayoutTxRequest.java
View file

@ -49,6 +49,7 @@ public class SendFinalizePayoutTxRequest extends TradeTask {
trade.getTradingPeer(),
processModel.tradingPeer.getPubKeyRing(),
message,
true,
new SendMessageListener() {
@Override
public void handleResult() {

1
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SendPublishDepositTxRequest.java
View file

@ -53,6 +53,7 @@ public class SendPublishDepositTxRequest extends TradeTask {
trade.getTradingPeer(),
processModel.tradingPeer.getPubKeyRing(),
tradeMessage,
false,
new SendMessageListener() {
@Override
public void handleResult() {