You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by tb...@apache.org on 2018/01/23 16:29:41 UTC

[1/2] brooklyn-server git commit: BROOKLYN-576: decrease amount of debug logging

Repository: brooklyn-server
Updated Branches:
  refs/heads/master 3d5bade5f -> c50fee8d1


BROOKLYN-576: decrease amount of debug logging

Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/4e3d4d08
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/4e3d4d08
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/4e3d4d08

Branch: refs/heads/master
Commit: 4e3d4d08039df00d5a19e9d933c9b03ab6da6d4c
Parents: 3d5bade
Author: Aled Sage <al...@gmail.com>
Authored: Tue Jan 23 15:51:05 2018 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Tue Jan 23 15:51:05 2018 +0000

----------------------------------------------------------------------
 .../camp/brooklyn/spi/creation/BrooklynEntityMatcher.java        | 2 +-
 .../camp/brooklyn/spi/dsl/BrooklynDslDeferredSupplier.java       | 4 ++--
 .../brooklyn/core/location/access/BrooklynAccessUtils.java       | 2 +-
 .../apache/brooklyn/core/objs/proxy/InternalLocationFactory.java | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/4e3d4d08/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityMatcher.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityMatcher.java b/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityMatcher.java
index 3b6e04b..ddfdd93 100644
--- a/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityMatcher.java
+++ b/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityMatcher.java
@@ -80,7 +80,7 @@ public class BrooklynEntityMatcher implements PdpMatcher {
         String type = lookupType(deploymentPlanItem);
         if (type==null) return false;
 
-        log.debug("Item "+deploymentPlanItem+" being instantiated with "+type);
+        log.trace("Item {} being instantiated with {}", deploymentPlanItem, type);
 
         Object old = atc.getInstantiator();
         if (old!=null && !old.equals(BrooklynAssemblyTemplateInstantiator.class)) {

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/4e3d4d08/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/BrooklynDslDeferredSupplier.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/BrooklynDslDeferredSupplier.java b/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/BrooklynDslDeferredSupplier.java
index 3b31637..626f41d 100644
--- a/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/BrooklynDslDeferredSupplier.java
+++ b/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/BrooklynDslDeferredSupplier.java
@@ -97,8 +97,8 @@ public abstract class BrooklynDslDeferredSupplier<T> implements DeferredSupplier
 
     @Override
     public final T get() {
-        if (log.isDebugEnabled())
-            log.debug("Queuing task to resolve "+dsl+", called by "+Tasks.current());
+        if (log.isTraceEnabled())
+            log.trace("Queuing task to resolve {}, called by {}", dsl, Tasks.current());
 
         ExecutionContext exec = BrooklynTaskTags.getCurrentExecutionContext();
         if (exec == null) {

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/4e3d4d08/core/src/main/java/org/apache/brooklyn/core/location/access/BrooklynAccessUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/location/access/BrooklynAccessUtils.java b/core/src/main/java/org/apache/brooklyn/core/location/access/BrooklynAccessUtils.java
index 35bc2f8..0943af1 100644
--- a/core/src/main/java/org/apache/brooklyn/core/location/access/BrooklynAccessUtils.java
+++ b/core/src/main/java/org/apache/brooklyn/core/location/access/BrooklynAccessUtils.java
@@ -66,7 +66,7 @@ public class BrooklynAccessUtils {
         // look up port forwarding
         PortForwardManager pfw = entity.getConfig(PORT_FORWARDING_MANAGER);
         if (pfw == null) {
-            log.debug("No PortForwardManager, using default");
+            log.trace("No PortForwardManager, using default");
             pfw = (PortForwardManager) entityInternal.getManagementContext().getLocationRegistry().getLocationManaged(PortForwardManagerLocationResolver.PFM_GLOBAL_SPEC);
         }
 

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/4e3d4d08/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalLocationFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalLocationFactory.java b/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalLocationFactory.java
index 0a19a26..4aab6ed 100644
--- a/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalLocationFactory.java
+++ b/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalLocationFactory.java
@@ -67,7 +67,7 @@ public class InternalLocationFactory extends InternalFactory {
             if (Locations.isManaged(loc)) {
                 // Construct can return an existing instance, if using SpecialBrooklynObjectConstructor.Config.SPECIAL_CONSTRUCTOR.
                 // In which case, don't reconfigure it (don't change its parent, etc).
-                LOG.debug("Location-factory returning pre-existing location; skipping initialization of {}", loc);
+                LOG.trace("Location-factory returning pre-existing location; skipping initialization of {}", loc);
                 return loc;
             }
 


[2/2] brooklyn-server git commit: This closes #939

Posted by tb...@apache.org.
This closes #939


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/c50fee8d
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/c50fee8d
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/c50fee8d

Branch: refs/heads/master
Commit: c50fee8d13b27f813f57f09ffebc2d26b3e7fdaf
Parents: 3d5bade 4e3d4d0
Author: Thomas Bouron <th...@cloudsoftcorp.com>
Authored: Tue Jan 23 16:29:35 2018 +0000
Committer: Thomas Bouron <th...@cloudsoftcorp.com>
Committed: Tue Jan 23 16:29:35 2018 +0000

----------------------------------------------------------------------
 .../camp/brooklyn/spi/creation/BrooklynEntityMatcher.java        | 2 +-
 .../camp/brooklyn/spi/dsl/BrooklynDslDeferredSupplier.java       | 4 ++--
 .../brooklyn/core/location/access/BrooklynAccessUtils.java       | 2 +-
 .../apache/brooklyn/core/objs/proxy/InternalLocationFactory.java | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------