address review comments
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/3fc4370f Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/3fc4370f Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/3fc4370f Branch: refs/heads/master Commit: 3fc4370f9dec8df26d4f86bf815048cb3ad9cce2 Parents: 01d6136 Author: Alex Heneveld <alex.henev...@cloudsoftcorp.com> Authored: Fri Jul 18 09:18:19 2014 -0400 Committer: Alex Heneveld <alex.henev...@cloudsoftcorp.com> Committed: Fri Jul 18 09:18:19 2014 -0400 ---------------------------------------------------------------------- .../java/brooklyn/management/internal/LocalLocationManager.java | 2 ++ .../brooklyn/rest/security/BrooklynPropertiesSecurityFilter.java | 4 ++-- .../src/main/java/brooklyn/rest/util/DefaultExceptionMapper.java | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3fc4370f/core/src/main/java/brooklyn/management/internal/LocalLocationManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/internal/LocalLocationManager.java b/core/src/main/java/brooklyn/management/internal/LocalLocationManager.java index 6c59f3b..d2fb3d7 100644 --- a/core/src/main/java/brooklyn/management/internal/LocalLocationManager.java +++ b/core/src/main/java/brooklyn/management/internal/LocalLocationManager.java @@ -41,12 +41,14 @@ import brooklyn.util.config.ConfigBag; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.exceptions.RuntimeInterruptedException; +import com.google.common.annotations.Beta; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableList; import com.google.common.collect.Maps; public class LocalLocationManager implements LocationManager { + @Beta /* expect to remove when API returns LocationSpec or similar */ public static final ConfigKey<Boolean> CREATE_UNMANAGED = ConfigKeys.newBooleanConfigKey("brooklyn.internal.location.createUnmanaged", "If set on a location or spec, causes the manager to create it in an unmanaged state (for peeking)", false); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3fc4370f/usage/rest-server/src/main/java/brooklyn/rest/security/BrooklynPropertiesSecurityFilter.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/brooklyn/rest/security/BrooklynPropertiesSecurityFilter.java b/usage/rest-server/src/main/java/brooklyn/rest/security/BrooklynPropertiesSecurityFilter.java index 1331e1f..801344d 100644 --- a/usage/rest-server/src/main/java/brooklyn/rest/security/BrooklynPropertiesSecurityFilter.java +++ b/usage/rest-server/src/main/java/brooklyn/rest/security/BrooklynPropertiesSecurityFilter.java @@ -111,10 +111,10 @@ public class BrooklynPropertiesSecurityFilter implements Filter { } catch (Throwable e) { // NB errors are typically already caught at this point - if (log.isDebugEnabled()) + if (log.isDebugEnabled()) { log.debug("REST failed processing request "+uri+" with "+entitlementContext+": "+e, e); + } - log.warn("REST failed processing request "+uri+" with "+entitlementContext+": "+e, e); throw Exceptions.propagate(e); } finally { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3fc4370f/usage/rest-server/src/main/java/brooklyn/rest/util/DefaultExceptionMapper.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/brooklyn/rest/util/DefaultExceptionMapper.java b/usage/rest-server/src/main/java/brooklyn/rest/util/DefaultExceptionMapper.java index 71bc945..ea395bc 100644 --- a/usage/rest-server/src/main/java/brooklyn/rest/util/DefaultExceptionMapper.java +++ b/usage/rest-server/src/main/java/brooklyn/rest/util/DefaultExceptionMapper.java @@ -88,7 +88,6 @@ public class DefaultExceptionMapper implements ExceptionMapper<Throwable> { if (!Exceptions.isPrefixBoring(throwable)) { if ( warnedUnknownExceptions.add( throwable.getClass() )) { - throwable.printStackTrace(); LOG.warn("REST call generated exception type "+throwable.getClass()+" unrecognized in "+getClass()+" (subsequent occurrences will be logged debug only): " + throwable); } }
