You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2016/03/07 11:52:14 UTC
[1/2] brooklyn-server git commit: Make unwanted state checks
configurable
Repository: brooklyn-server
Updated Branches:
refs/heads/master 6e39ce68b -> ba57efa39
Make unwanted state checks configurable
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/4147a57f
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/4147a57f
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/4147a57f
Branch: refs/heads/master
Commit: 4147a57fc8779dd79ff589ab401ac32f5cf619b1
Parents: 4d72b68
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Sun Mar 6 17:44:46 2016 +0200
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Mon Mar 7 12:40:06 2016 +0200
----------------------------------------------------------------------
.../persist/UnwantedStateLoggingMapper.java | 27 ++++++++++----------
1 file changed, 13 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/4147a57f/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/UnwantedStateLoggingMapper.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/UnwantedStateLoggingMapper.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/UnwantedStateLoggingMapper.java
index 038a017..a912b5b 100644
--- a/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/UnwantedStateLoggingMapper.java
+++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/UnwantedStateLoggingMapper.java
@@ -30,6 +30,7 @@ import com.thoughtworks.xstream.mapper.MapperWrapper;
public class UnwantedStateLoggingMapper extends MapperWrapper {
private static final Logger LOG = LoggerFactory.getLogger(UnwantedStateLoggingMapper.class);
private static final AtomicLong WARN_CNT = new AtomicLong();
+ private static Class<?>[] TYPES_TO_WARN_IF_SERIALIZE = {Task.class, Thread.class, ThreadLocal.class};
public UnwantedStateLoggingMapper(Mapper wrapped) {
super(wrapped);
@@ -43,21 +44,19 @@ public class UnwantedStateLoggingMapper extends MapperWrapper {
private void logIfInteresting(Class<?> type) {
if (type != null) {
- if (Task.class.isAssignableFrom(type)) {
- long cnt = WARN_CNT.getAndIncrement();
- if (cnt < 5 || cnt % 10000 == 0) {
- LOG.warn("Trying to serialize a Task object of type " + type + ". " +
- "Task object serialization is not supported or recommended. " +
- "Check if the Task object is set as a config or sensor value by mistake.");
+ for (Class<?> warnClass : TYPES_TO_WARN_IF_SERIALIZE) {
+ if (warnClass.isAssignableFrom(type)) {
+ long cnt = WARN_CNT.getAndIncrement();
+ if (cnt < 5 || cnt % 10000 == 0) {
+ LOG.warn("Trying to serialize a " + warnClass.getSimpleName() + " object of type " + type + " which could lead " +
+ "to unexpected behaviour upon rebind. " + warnClass.getSimpleName() + " object serialization is not " +
+ "supported or recommended. Check if the " + warnClass.getSimpleName() + " object (or its container) " +
+ "is set as a config or sensor value by mistake.");
+ }
}
- } else if (ThreadLocal.class.isAssignableFrom(type)) {
- long cnt = WARN_CNT.getAndIncrement();
- if (cnt < 5 || cnt % 10000 == 0) {
- LOG.warn("Trying to serialize a ThreadLocal object of type " + type + ", which could lead to unexpected" +
- "behaviour upon rebind. ThreadLocal object serialization is not supported or recommended. " +
- "Check if a wrapper for ThreadLocal object is set as a config or sensor value by mistake.");
- }
- } else if (LOG.isTraceEnabled()) {
+ }
+
+ if (LOG.isTraceEnabled()) {
LOG.trace("Serializing object of type " + type.getName());
}
// TODO could add more checks to guide developers, for example
[2/2] brooklyn-server git commit: This closes #50
Posted by he...@apache.org.
This closes #50
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/ba57efa3
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/ba57efa3
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/ba57efa3
Branch: refs/heads/master
Commit: ba57efa3991a06cd168bd9c8a8224b75f72424eb
Parents: 6e39ce6 4147a57
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Mon Mar 7 10:52:07 2016 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Mon Mar 7 10:52:07 2016 +0000
----------------------------------------------------------------------
.../persist/UnwantedStateLoggingMapper.java | 27 ++++++++++----------
1 file changed, 13 insertions(+), 14 deletions(-)
----------------------------------------------------------------------