diff --git a/common/src/main/java/bisq/common/FrameRateTimer.java b/common/src/main/java/bisq/common/FrameRateTimer.java index 20d23e579e7..cd1ddbf06f0 100644 --- a/common/src/main/java/bisq/common/FrameRateTimer.java +++ b/common/src/main/java/bisq/common/FrameRateTimer.java @@ -54,8 +54,7 @@ public void run() { stop(); } } catch (Throwable t) { - log.error(t.getMessage()); - t.printStackTrace(); + log.error("exception in FrameRateTimer", t); stop(); throw t; } diff --git a/common/src/main/java/bisq/common/UserThread.java b/common/src/main/java/bisq/common/UserThread.java index d7b994eeda5..1166769f535 100644 --- a/common/src/main/java/bisq/common/UserThread.java +++ b/common/src/main/java/bisq/common/UserThread.java @@ -93,8 +93,7 @@ private static Timer getTimer() { return timerClass.getDeclaredConstructor().newInstance(); } catch (InstantiationException | NoSuchMethodException | InvocationTargetException | IllegalAccessException e) { String message = "Could not instantiate timer bsTimerClass=" + timerClass; - log.error(message); - e.printStackTrace(); + log.error(message, e); throw new RuntimeException(message); } } diff --git a/common/src/main/java/bisq/common/crypto/Encryption.java b/common/src/main/java/bisq/common/crypto/Encryption.java index a04ea2df34c..1d5cda95109 100644 --- a/common/src/main/java/bisq/common/crypto/Encryption.java +++ b/common/src/main/java/bisq/common/crypto/Encryption.java @@ -70,8 +70,7 @@ public static KeyPair generateKeyPair() { log.trace("Generate msgEncryptionKeyPair needed {} ms", System.currentTimeMillis() - ts); return keyPair; } catch (Throwable e) { - log.error(e.toString()); - e.printStackTrace(); + log.error("Could not create key.", e); throw new RuntimeException("Could not create key."); } } @@ -87,7 +86,7 @@ public static byte[] encrypt(byte[] payload, SecretKey secretKey) throws CryptoE cipher.init(Cipher.ENCRYPT_MODE, secretKey); return cipher.doFinal(payload); } catch (Throwable e) { - e.printStackTrace(); + log.error("error in encrypt", e); throw new CryptoException(e); } } @@ -128,8 +127,7 @@ private static byte[] getPayloadWithHmac(byte[] payload, SecretKey secretKey) { outputStream.flush(); payloadWithHmac = outputStream.toByteArray().clone(); } catch (IOException | NoSuchProviderException e) { - log.error(e.toString()); - e.printStackTrace(); + log.error("Could not create hmac", e); throw new RuntimeException("Could not create hmac"); } finally { if (outputStream != null) { @@ -140,8 +138,7 @@ private static byte[] getPayloadWithHmac(byte[] payload, SecretKey secretKey) { } } } catch (Throwable e) { - log.error(e.toString()); - e.printStackTrace(); + log.error("Could not create hmac", e); throw new RuntimeException("Could not create hmac"); } return payloadWithHmac; @@ -153,8 +150,7 @@ private static boolean verifyHmac(byte[] message, byte[] hmac, SecretKey secretK byte[] hmacTest = getHmac(message, secretKey); return Arrays.equals(hmacTest, hmac); } catch (Throwable e) { - log.error(e.toString()); - e.printStackTrace(); + log.error("Could not create cipher", e); throw new RuntimeException("Could not create cipher"); } } @@ -204,7 +200,7 @@ public static byte[] encryptSecretKey(SecretKey secretKey, PublicKey publicKey) cipher.init(Cipher.WRAP_MODE, publicKey, oaepParameterSpec); return cipher.wrap(secretKey); } catch (Throwable e) { - e.printStackTrace(); + log.error("Couldn't encrypt payload", e); throw new CryptoException("Couldn't encrypt payload"); } } @@ -233,8 +229,7 @@ public static SecretKey generateSecretKey(int bits) { keyPairGenerator.init(bits); return keyPairGenerator.generateKey(); } catch (Throwable e) { - e.printStackTrace(); - log.error(e.getMessage()); + log.error("Couldn't generate key", e); throw new RuntimeException("Couldn't generate key"); } } @@ -252,7 +247,6 @@ public static PublicKey getPublicKeyFromBytes(byte[] encryptionPubKeyBytes) { return KeyFactory.getInstance(Encryption.ASYM_KEY_ALGO).generatePublic(new X509EncodedKeySpec(encryptionPubKeyBytes)); } catch (InvalidKeySpecException | NoSuchAlgorithmException e) { log.error("Error creating sigPublicKey from bytes. sigPublicKeyBytes as hex={}, error={}", Utilities.bytesAsHexString(encryptionPubKeyBytes), e); - e.printStackTrace(); throw new KeyConversionException(e); } } diff --git a/common/src/main/java/bisq/common/crypto/Hash.java b/common/src/main/java/bisq/common/crypto/Hash.java index 078582266a9..c07768dcad1 100644 --- a/common/src/main/java/bisq/common/crypto/Hash.java +++ b/common/src/main/java/bisq/common/crypto/Hash.java @@ -43,8 +43,7 @@ public static byte[] getSha256Hash(byte[] data) { digest.update(data, 0, data.length); return digest.digest(); } catch (NoSuchAlgorithmException e) { - log.error("Could not create MessageDigest for hash. " + e.toString()); - e.printStackTrace(); + log.error("Could not create MessageDigest for hash. ", e); throw new RuntimeException(e); } } diff --git a/common/src/main/java/bisq/common/crypto/KeyStorage.java b/common/src/main/java/bisq/common/crypto/KeyStorage.java index 82274c34d20..1044d099ef8 100644 --- a/common/src/main/java/bisq/common/crypto/KeyStorage.java +++ b/common/src/main/java/bisq/common/crypto/KeyStorage.java @@ -136,8 +136,7 @@ public KeyPair loadKeyPair(KeyEntry keyEntry) { PKCS8EncodedKeySpec privateKeySpec = new PKCS8EncodedKeySpec(encodedPrivateKey); privateKey = keyFactory.generatePrivate(privateKeySpec); } catch (InvalidKeySpecException | IOException e) { - log.error(e.getMessage()); - e.printStackTrace(); + log.error("Could not load key " + keyEntry.toString(), e.getMessage()); throw new RuntimeException("Could not load key " + keyEntry.toString(), e); } @@ -161,8 +160,7 @@ public KeyPair loadKeyPair(KeyEntry keyEntry) { log.debug("load completed in {} msec", System.currentTimeMillis() - new Date().getTime()); return new KeyPair(publicKey, privateKey); } catch (NoSuchAlgorithmException | InvalidKeySpecException e) { - e.printStackTrace(); - log.error(e.getMessage()); + log.error("Could not load key " + keyEntry.toString(), e); throw new RuntimeException("Could not load key " + keyEntry.toString(), e); } } @@ -181,8 +179,7 @@ private void savePrivateKey(PrivateKey privateKey, String name) { try (FileOutputStream fos = new FileOutputStream(storageDir + "/" + name + ".key")) { fos.write(pkcs8EncodedKeySpec.getEncoded()); } catch (IOException e) { - log.error(e.toString()); - e.printStackTrace(); + log.error("Could not save key " + name, e); throw new RuntimeException("Could not save key " + name, e); } } diff --git a/common/src/main/java/bisq/common/crypto/Sig.java b/common/src/main/java/bisq/common/crypto/Sig.java index 659ed3d6b86..c276f8f7db4 100644 --- a/common/src/main/java/bisq/common/crypto/Sig.java +++ b/common/src/main/java/bisq/common/crypto/Sig.java @@ -65,8 +65,7 @@ public static KeyPair generateKeyPair() { log.trace("Generate msgSignatureKeyPair needed {} ms", System.currentTimeMillis() - ts); return keyPair; } catch (NoSuchAlgorithmException e) { - e.printStackTrace(); - log.error(e.toString()); + log.error("Could not create key.", e); throw new RuntimeException("Could not create key."); } }