diff --git a/src/main/java/io/github/valfadeev/rundeck/plugin/vault/VaultStoragePlugin.java b/src/main/java/io/github/valfadeev/rundeck/plugin/vault/VaultStoragePlugin.java index 40b559a..c950c44 100644 --- a/src/main/java/io/github/valfadeev/rundeck/plugin/vault/VaultStoragePlugin.java +++ b/src/main/java/io/github/valfadeev/rundeck/plugin/vault/VaultStoragePlugin.java @@ -3,6 +3,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.*; +import java.util.logging.Level; import java.util.stream.Collectors; import com.bettercloud.vault.Vault; @@ -314,30 +315,45 @@ private boolean isDir(String key) { } protected void lookup(){ + log.info("Beginning Vault lookup..."); try { + log.info("Will try to lookup self..."); LookupResponse lookupSelf = getVaultClient().auth().lookupSelf(); if (lookupSelf.getTTL() <= guaranteedTokenValidity || lookupSelf.getNumUses() < 0) { loginVault(clientProvider); } } catch (VaultException e) { + log.log(Level.WARNING, "Caught VaultException: " + e.getMessage(), e); + if(e.getHttpStatusCode() == 403){//try login again + log.info("Received 403, will try login again"); loginVault(clientProvider); } else { + log.log(Level.WARNING, "Not a 403 error: " + e.getMessage(), e); e.printStackTrace(); } } catch (ConfigurationException e) { + log.log(Level.WARNING, "Caught ConfigurationException: " + e.getMessage(), e); + e.printStackTrace(); + } catch (Exception e) { + log.log(Level.WARNING, "Caught Exception: " + e.getMessage(), e); e.printStackTrace(); } + log.info("Finished Vault lookup succesfully."); } private void loginVault(VaultClientProvider provider){ + log.info("Logging into Vault..."); try{ + log.info("Getting Vault Client from provider"); vaultClient = provider.getVaultClient(); + log.info("Calling vaultClient logical"); vault = vaultClient.logical(); } - catch (Exception ignored){ - + catch (Exception e){ + log.log(Level.WARNING, "Error logging into Vault: " + e.getMessage(), e); } + log.info("Logged into Vault successfully"); } private boolean isVaultDir(String key) {