You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ge...@apache.org on 2017/03/02 10:57:36 UTC
[1/2] brooklyn-server git commit: Log REST invocation of effectors
Repository: brooklyn-server
Updated Branches:
refs/heads/master a1ae7c0fc -> 340fdc9b5
Log REST invocation of effectors
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/71a6909f
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/71a6909f
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/71a6909f
Branch: refs/heads/master
Commit: 71a6909f9c137f9f43f10dfb998fe932e0f7aa98
Parents: 6d8127e
Author: Guglielmo Nigri <gu...@cloudsoftcorp.com>
Authored: Thu Mar 2 11:37:33 2017 +0100
Committer: Guglielmo Nigri <gu...@cloudsoftcorp.com>
Committed: Thu Mar 2 11:37:33 2017 +0100
----------------------------------------------------------------------
.../java/org/apache/brooklyn/rest/resources/EffectorResource.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/71a6909f/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/EffectorResource.java
----------------------------------------------------------------------
diff --git a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/EffectorResource.java b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/EffectorResource.java
index 14d64e8..1417a5c 100644
--- a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/EffectorResource.java
+++ b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/EffectorResource.java
@@ -90,7 +90,8 @@ public class EffectorResource extends AbstractBrooklynRestResource implements Ef
throw WebResourceUtils.forbidden("User '%s' is not authorized to invoke effector %s on entity %s",
Entitlements.getEntitlementContext().user(), effector.get().getName(), entity);
}
- log.info("REST invocation of " + entity + "." + effector.get() + " " + Sanitizer.sanitize(parameters));
+ String userInfo = Entitlements.getEntitlementContext() != null ? "by user " + Entitlements.getEntitlementContext().user() : "(no user info available)";
+ log.info("REST invocation of " + entity + "." + effector.get() + " " + Sanitizer.sanitize(parameters) + " " + userInfo);
Task<?> t = entity.invoke(effector.get(), parameters);
try {
[2/2] brooklyn-server git commit: Closes #579
Posted by ge...@apache.org.
Closes #579
Log User info on effector invocation via REST API
- Add user information
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/340fdc9b
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/340fdc9b
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/340fdc9b
Branch: refs/heads/master
Commit: 340fdc9b53136f10dc94be344fa3138b0f28b45c
Parents: a1ae7c0 71a6909
Author: Geoff Macartney <ge...@cloudsoftcorp.com>
Authored: Thu Mar 2 10:57:27 2017 +0000
Committer: Geoff Macartney <ge...@cloudsoftcorp.com>
Committed: Thu Mar 2 10:57:27 2017 +0000
----------------------------------------------------------------------
.../java/org/apache/brooklyn/rest/resources/EffectorResource.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------