From 006473ca19358a7d59f117bd64ad9c78d1150560 Mon Sep 17 00:00:00 2001 From: Nicolas Vazquez Date: Wed, 18 May 2022 10:29:00 -0300 Subject: [PATCH] Log exception on keystore build for custom certificate (#6394) * Log exception on keystore build for custom certificate * Refactor --- .../security/keystore/KeystoreManagerImpl.java | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/framework/security/src/main/java/org/apache/cloudstack/framework/security/keystore/KeystoreManagerImpl.java b/framework/security/src/main/java/org/apache/cloudstack/framework/security/keystore/KeystoreManagerImpl.java index bed74bf4c3e..34755dbd3e4 100644 --- a/framework/security/src/main/java/org/apache/cloudstack/framework/security/keystore/KeystoreManagerImpl.java +++ b/framework/security/src/main/java/org/apache/cloudstack/framework/security/keystore/KeystoreManagerImpl.java @@ -108,16 +108,12 @@ public class KeystoreManagerImpl extends ManagerBase implements KeystoreManager try { return CertificateHelper.buildAndSaveKeystore(certs, storePassword); - } catch (KeyStoreException e) { - s_logger.warn("Unable to build keystore for " + name + " due to KeyStoreException"); - } catch (CertificateException e) { - s_logger.warn("Unable to build keystore for " + name + " due to CertificateException"); - } catch (NoSuchAlgorithmException e) { - s_logger.warn("Unable to build keystore for " + name + " due to NoSuchAlgorithmException"); - } catch (InvalidKeySpecException e) { - s_logger.warn("Unable to build keystore for " + name + " due to InvalidKeySpecException"); - } catch (IOException e) { - s_logger.warn("Unable to build keystore for " + name + " due to IOException"); + } catch (KeyStoreException | CertificateException | NoSuchAlgorithmException | InvalidKeySpecException | IOException e) { + String msg = String.format("Unable to build keystore for %s due to %s", name, e.getClass().getSimpleName()); + s_logger.warn(msg); + if (s_logger.isDebugEnabled()) { + s_logger.debug(msg, e); + } } return null; }