modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceContainer.java | 15 ++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
New commits: commit a05f561f5fcac94b3308937b07d3b1e1e3f84d58 Author: Thomas Segismont tsegismo@redhat.com Date: Wed Jul 17 16:59:03 2013 +0200
Print simpler log message when component invocation is interrupted and log level is higher than debug
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceContainer.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceContainer.java index a9fe1c2..3669947 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceContainer.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceContainer.java @@ -671,8 +671,19 @@ public class ResourceContainer implements Serializable {
public void markContextInterrupted() { localContext.markInterrupted(); - LOG.warn("Invocation has been marked interrupted for method [" + method + "] on resource [" - + resourceContainer.getResource() + "]"); + LOG.warn(getContextInterruptedWarningMessage(LOG.isDebugEnabled())); + } + + private String getContextInterruptedWarningMessage(boolean detailed) { + StringBuilder sb = new StringBuilder(); + sb.append("Invocation has been marked interrupted for method ["); + if (detailed) { + sb.append(method.toGenericString()); + } else { + sb.append(method.getDeclaringClass().getSimpleName()).append(".").append(method.getName()); + } + sb.append("] on resource [").append(resourceContainer.getResource()).append("]"); + return sb.toString(); } } }