Assign the secret store and log errors correctly

elastic · Jun 1, 2018 · 4ca7845 · 4ca7845
1 parent 6a8731c
commit 4ca7845
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/logstash-core/src/main/java/org/logstash/common/SubstitutionVariables.java b/logstash-core/src/main/java/org/logstash/common/SubstitutionVariables.java
@@ -28,7 +28,7 @@ static String replacePlaceholders(final String input,
             SecretStore secretStore = null;
             try {
                 if (secretStoreFactory.exists(secureConfig)) {
-                    secretStoreFactory.load(secureConfig);
+                    secretStore = secretStoreFactory.load(secureConfig);
                 }
             } catch (SecretStoreException.AccessException e) {
                 // Non-fatal condition
@@ -62,9 +62,13 @@ static String replacePlaceholders(final String input,
                     "Cannot evaluate `%s`. Replacement variable `%s` is not defined in a Logstash secret store " +
                             "or as an Environment entry and there is no default value given.",
                     matchResult.group(0), name);
-            throw new MissingSubstitutionVariableError();
+            throw new MissingSubstitutionVariableError(errMsg);
         });
     }
 
-    static class MissingSubstitutionVariableError extends RuntimeException {}
+    static class MissingSubstitutionVariableError extends RuntimeException {
+        public MissingSubstitutionVariableError(String errMsg) {
+            super(errMsg);
+        }
+    }
 }