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

[1/2] brooklyn-server git commit: Don't log the "No location resolving context found" error by default

Repository: brooklyn-server
Updated Branches:
  refs/heads/master b2ae1ccce -> 4c7581508


Don't log the "No location resolving context found" error by default

Turns out it's too chatty, with non-trivial callers to add calling context to.


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

Branch: refs/heads/master
Commit: 77b8833aeb942dd0520fb3d0e17703e2e74f08cc
Parents: a4e6995
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Fri Jan 27 14:31:26 2017 +0200
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Fri Jan 27 14:31:26 2017 +0200

----------------------------------------------------------------------
 .../brooklyn/core/location/internal/LocationConfigMap.java      | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/77b8833a/core/src/main/java/org/apache/brooklyn/core/location/internal/LocationConfigMap.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/location/internal/LocationConfigMap.java b/core/src/main/java/org/apache/brooklyn/core/location/internal/LocationConfigMap.java
index 6d08479..689f5f2 100644
--- a/core/src/main/java/org/apache/brooklyn/core/location/internal/LocationConfigMap.java
+++ b/core/src/main/java/org/apache/brooklyn/core/location/internal/LocationConfigMap.java
@@ -63,7 +63,10 @@ public class LocationConfigMap extends AbstractConfigMapImpl<Location> {
         if (contextEntity != null) {
             return ((EntityInternal)contextEntity).getExecutionContext();
         } else {
-            log.debug("No resolving context found, will use global execution context. Could lead to NPE on DSL resolving.");
+            // Known places we get called without entity context:
+            // * unmanaging entity and subsequently its location
+            // * EntityResource.listTasks(String, String) returning a Task<SshMachineLocation> and calling toString() on the return value
+            log.trace("No resolving context found, will use global execution context. Could lead to NPE on DSL resolving.");
             if (bo==null) return null;
             ManagementContext mgmt = ((AbstractLocation)bo).getManagementContext();
             if (mgmt==null) return null;


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

Posted by al...@apache.org.
This closes #540


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

Branch: refs/heads/master
Commit: 4c758150829875eb518a2ad7d6f9a0f2a478a0e0
Parents: b2ae1cc 77b8833
Author: Aled Sage <al...@gmail.com>
Authored: Sun Jan 29 20:16:29 2017 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Sun Jan 29 20:16:29 2017 +0000

----------------------------------------------------------------------
 .../brooklyn/core/location/internal/LocationConfigMap.java      | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------