You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by dr...@apache.org on 2017/07/26 09:44:40 UTC
[1/2] brooklyn-server git commit: Removes all logging of vault
responses
Repository: brooklyn-server
Updated Branches:
refs/heads/master 6881d354e -> 0f325f280
Removes all logging of vault responses
Previously body & headers were logged now only the URI and status code is logged
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/1637e29d
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/1637e29d
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/1637e29d
Branch: refs/heads/master
Commit: 1637e29d0e73d3bbb9b2b24e5585043666928f7e
Parents: 6881d35
Author: Mark McKenna <m4...@gmail.com>
Authored: Wed Jul 26 10:35:37 2017 +0100
Committer: Mark McKenna <m4...@gmail.com>
Committed: Wed Jul 26 10:35:37 2017 +0100
----------------------------------------------------------------------
.../vault/VaultExternalConfigSupplier.java | 33 ++++++++------------
1 file changed, 13 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/1637e29d/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 01d9798..f610e01 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
@@ -18,13 +18,14 @@
*/
package org.apache.brooklyn.core.config.external.vault;
-import java.io.UnsupportedEncodingException;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
+import com.google.common.base.Joiner;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
import org.apache.brooklyn.api.mgmt.ManagementContext;
import org.apache.brooklyn.core.config.external.AbstractExternalConfigSupplier;
import org.apache.brooklyn.util.exceptions.Exceptions;
@@ -36,12 +37,10 @@ import org.apache.http.client.HttpClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.Joiner;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Lists;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonObject;
+import java.io.UnsupportedEncodingException;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
public abstract class VaultExternalConfigSupplier extends AbstractExternalConfigSupplier {
public static final String CHARSET_NAME = "UTF-8";
@@ -106,10 +105,8 @@ public abstract class VaultExternalConfigSupplier extends AbstractExternalConfig
try {
String uri = Urls.mergePaths(endpoint, path);
LOG.trace("Vault request - GET: {}", uri);
- LOG.trace("Vault request - headers: {}", headers.toString());
HttpToolResponse response = HttpTool.httpGet(httpClient, Urls.toUri(uri), headers);
- LOG.trace("Vault response - code: {} {}", new Object[]{Integer.toString(response.getResponseCode()), response.getReasonPhrase()});
- LOG.trace("Vault response - headers: {}", response.getHeaderLists().toString());
+ LOG.trace("Vault response - code: {} {}", response.getResponseCode(), response.getReasonPhrase());
String responseBody = new String(response.getContent(), CHARSET_NAME);
if (HttpTool.isStatusCodeHealthy(response.getResponseCode())) {
return gson.fromJson(responseBody, JsonObject.class);
@@ -125,14 +122,10 @@ public abstract class VaultExternalConfigSupplier extends AbstractExternalConfig
try {
String body = gson.toJson(requestData);
String uri = Urls.mergePaths(endpoint, path);
- LOG.debug("Vault request - POST: {}", uri);
- LOG.debug("Vault request - headers: {}", headers.toString());
- LOG.debug("Vault request - body: {}", body);
+ LOG.trace("Vault request - POST: {}", uri);
HttpToolResponse response = HttpTool.httpPost(httpClient, Urls.toUri(uri), headers, body.getBytes(CHARSET_NAME));
- LOG.debug("Vault response - code: {} {}", new Object[]{Integer.toString(response.getResponseCode()), response.getReasonPhrase()});
- LOG.debug("Vault response - headers: {}", response.getHeaderLists().toString());
+ LOG.trace("Vault response - code: {} {}", response.getResponseCode(), response.getReasonPhrase());
String responseBody = new String(response.getContent(), CHARSET_NAME);
- LOG.debug("Vault response - body: {}", responseBody);
if (HttpTool.isStatusCodeHealthy(response.getResponseCode())) {
return gson.fromJson(responseBody, JsonObject.class);
} else {
[2/2] brooklyn-server git commit: This closes #780
Posted by dr...@apache.org.
This closes #780
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/0f325f28
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/0f325f28
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/0f325f28
Branch: refs/heads/master
Commit: 0f325f28094a958949405e48cdd45be6d903c4da
Parents: 6881d35 1637e29
Author: Duncan Godwin <dr...@googlemail.com>
Authored: Wed Jul 26 10:44:34 2017 +0100
Committer: Duncan Godwin <dr...@googlemail.com>
Committed: Wed Jul 26 10:44:34 2017 +0100
----------------------------------------------------------------------
.../vault/VaultExternalConfigSupplier.java | 33 ++++++++------------
1 file changed, 13 insertions(+), 20 deletions(-)
----------------------------------------------------------------------