You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2015/11/17 10:09:47 UTC
[1/2] incubator-brooklyn git commit: Vault HTTP requests were logged
at too high level
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master de82e7a46 -> cc30e6f36
Vault HTTP requests were logged at too high level
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/5a77ee16
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/5a77ee16
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/5a77ee16
Branch: refs/heads/master
Commit: 5a77ee169631b35064c8431b403b137fef321e41
Parents: 89cf94f
Author: Richard Downer <ri...@apache.org>
Authored: Mon Nov 16 22:43:34 2015 +0000
Committer: Richard Downer <ri...@apache.org>
Committed: Mon Nov 16 22:43:34 2015 +0000
----------------------------------------------------------------------
.../vault/VaultExternalConfigSupplier.java | 22 ++++++++++----------
1 file changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5a77ee16/core/src/main/java/org/apache/brooklyn/core/config/external/vault/VaultExternalConfigSupplier.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/config/external/vault/VaultExternalConfigSupplier.java b/core/src/main/java/org/apache/brooklyn/core/config/external/vault/VaultExternalConfigSupplier.java
index 6e9980d..f58dbc5 100644
--- a/core/src/main/java/org/apache/brooklyn/core/config/external/vault/VaultExternalConfigSupplier.java
+++ b/core/src/main/java/org/apache/brooklyn/core/config/external/vault/VaultExternalConfigSupplier.java
@@ -92,13 +92,13 @@ public abstract class VaultExternalConfigSupplier extends AbstractExternalConfig
protected JsonObject apiGet(String path, ImmutableMap<String, String> headers) {
try {
String uri = Urls.mergePaths(endpoint, path);
- LOG.info("Vault request - GET: {}", uri);
- LOG.info("Vault request - headers: {}", headers.toString());
+ LOG.debug("Vault request - GET: {}", uri);
+ LOG.debug("Vault request - headers: {}", headers.toString());
HttpToolResponse response = HttpTool.httpGet(httpClient, Urls.toUri(uri), headers);
- LOG.info("Vault response - code: {} {}", new Object[]{Integer.toString(response.getResponseCode()), response.getReasonPhrase()});
- LOG.info("Vault response - headers: {}", response.getHeaderLists().toString());
+ LOG.debug("Vault response - code: {} {}", new Object[]{Integer.toString(response.getResponseCode()), response.getReasonPhrase()});
+ LOG.debug("Vault response - headers: {}", response.getHeaderLists().toString());
String responseBody = new String(response.getContent(), CHARSET_NAME);
- LOG.info("Vault response - body: {}", responseBody);
+ LOG.debug("Vault response - body: {}", responseBody);
if (HttpTool.isStatusCodeHealthy(response.getResponseCode())) {
return gson.fromJson(responseBody, JsonObject.class);
} else {
@@ -113,14 +113,14 @@ public abstract class VaultExternalConfigSupplier extends AbstractExternalConfig
try {
String body = gson.toJson(requestData);
String uri = Urls.mergePaths(endpoint, path);
- LOG.info("Vault request - POST: {}", uri);
- LOG.info("Vault request - headers: {}", headers.toString());
- LOG.info("Vault request - body: {}", body);
+ LOG.debug("Vault request - POST: {}", uri);
+ LOG.debug("Vault request - headers: {}", headers.toString());
+ LOG.debug("Vault request - body: {}", body);
HttpToolResponse response = HttpTool.httpPost(httpClient, Urls.toUri(uri), headers, body.getBytes(CHARSET_NAME));
- LOG.info("Vault response - code: {} {}", new Object[]{Integer.toString(response.getResponseCode()), response.getReasonPhrase()});
- LOG.info("Vault response - headers: {}", response.getHeaderLists().toString());
+ LOG.debug("Vault response - code: {} {}", new Object[]{Integer.toString(response.getResponseCode()), response.getReasonPhrase()});
+ LOG.debug("Vault response - headers: {}", response.getHeaderLists().toString());
String responseBody = new String(response.getContent(), CHARSET_NAME);
- LOG.info("Vault response - body: {}", responseBody);
+ LOG.debug("Vault response - body: {}", responseBody);
if (HttpTool.isStatusCodeHealthy(response.getResponseCode())) {
return gson.fromJson(responseBody, JsonObject.class);
} else {
[2/2] incubator-brooklyn git commit: This closes #1035
Posted by he...@apache.org.
This closes #1035
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/cc30e6f3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/cc30e6f3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/cc30e6f3
Branch: refs/heads/master
Commit: cc30e6f366ed78cfc5bc7ccbed1504e84c45ee3f
Parents: de82e7a 5a77ee1
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Nov 17 09:09:38 2015 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Tue Nov 17 09:09:38 2015 +0000
----------------------------------------------------------------------
.../vault/VaultExternalConfigSupplier.java | 22 ++++++++++----------
1 file changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------