Merge branch 'logging' of https://github.com/oscarguindzberg/bisq into oscarguindzberg-logging

# Conflicts:
#	core/src/main/java/bisq/core/arbitration/DisputeManager.java
This commit is contained in:
Manfred Karrer 2019-05-14 23:35:17 +02:00
commit aa92c8131b
No known key found for this signature in database
GPG key ID: 401250966A6B2C46

View file

@ -997,9 +997,8 @@ public class DisputeManager implements PersistedDataHost {
success = true;
}
} catch (TransactionVerificationException e) {
e.printStackTrace();
errorMessage = "Error at traderSignAndFinalizeDisputedPayoutTx " + e.toString();
log.error(errorMessage);
log.error(errorMessage, e);
success = false;
// We prefer to close the dispute in that case. If there was no deposit tx and a random tx was used
@ -1014,9 +1013,8 @@ public class DisputeManager implements PersistedDataHost {
throw new RuntimeException(errorMessage);
} catch (AddressFormatException | WalletException e) {
e.printStackTrace();
errorMessage = "Error at traderSignAndFinalizeDisputedPayoutTx " + e.toString();
log.error(errorMessage);
log.error(errorMessage, e);
success = false;
throw new RuntimeException(errorMessage);
} finally {