0 files changed
New commits: commit a469ad14ddf692f9b3662179ec5070868e35f547 Author: Torben Jaeger torben@jit-central.com Date: Fri Feb 10 11:21:39 2012 +0100
Enable gathering of server logs.
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java index bc0374a..d62c55b 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java @@ -41,6 +41,7 @@ import org.rhq.core.pluginapi.configuration.ConfigurationFacet; import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport; import org.rhq.core.pluginapi.content.ContentContext; import org.rhq.core.pluginapi.content.ContentServices; +import org.rhq.core.pluginapi.event.log.LogFileEventResourceComponentHelper; import org.rhq.core.pluginapi.inventory.CreateChildResourceFacet; import org.rhq.core.pluginapi.inventory.CreateResourceReport; import org.rhq.core.pluginapi.inventory.DeleteResourceFacet; @@ -93,6 +94,8 @@ public class BaseComponent<T extends ResourceComponent<?>> implements ResourceCo String managementUser; String managementPassword;
+ private LogFileEventResourceComponentHelper logFileEventDelegate; + /** * Return availability of this resource * @see org.rhq.core.pluginapi.inventory.ResourceComponent#getAvailability() @@ -121,6 +124,8 @@ public class BaseComponent<T extends ResourceComponent<?>> implements ResourceCo managementUser = pluginConfiguration.getSimpleValue("user","-unset-"); managementPassword = pluginConfiguration.getSimpleValue("password","-unset-"); connection = new ASConnection(host,port, managementUser, managementPassword); + logFileEventDelegate = new LogFileEventResourceComponentHelper(context); + logFileEventDelegate.startLogFileEventPollers(); } else { connection = ((BaseComponent)context.getParentResourceComponent()).getASConnection(); @@ -141,8 +146,9 @@ public class BaseComponent<T extends ResourceComponent<?>> implements ResourceCo * @see org.rhq.core.pluginapi.inventory.ResourceComponent#stop() */ public void stop() { - - + if (!(context.getParentResourceComponent() instanceof BaseComponent)) { + logFileEventDelegate.stopLogFileEventPollers(); + } }
commit e4f70659839387e27d6622c6a59d82a02705974e Author: Heiko W. Rupp hwr@redhat.com Date: Fri Feb 10 11:20:11 2012 +0100
Revert "Enable gathering of server logs."
This reverts commit a8c8969068a0e365782f29306998e990b67890d0. as the author is wrong.
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java index d62c55b..bc0374a 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java @@ -41,7 +41,6 @@ import org.rhq.core.pluginapi.configuration.ConfigurationFacet; import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport; import org.rhq.core.pluginapi.content.ContentContext; import org.rhq.core.pluginapi.content.ContentServices; -import org.rhq.core.pluginapi.event.log.LogFileEventResourceComponentHelper; import org.rhq.core.pluginapi.inventory.CreateChildResourceFacet; import org.rhq.core.pluginapi.inventory.CreateResourceReport; import org.rhq.core.pluginapi.inventory.DeleteResourceFacet; @@ -94,8 +93,6 @@ public class BaseComponent<T extends ResourceComponent<?>> implements ResourceCo String managementUser; String managementPassword;
- private LogFileEventResourceComponentHelper logFileEventDelegate; - /** * Return availability of this resource * @see org.rhq.core.pluginapi.inventory.ResourceComponent#getAvailability() @@ -124,8 +121,6 @@ public class BaseComponent<T extends ResourceComponent<?>> implements ResourceCo managementUser = pluginConfiguration.getSimpleValue("user","-unset-"); managementPassword = pluginConfiguration.getSimpleValue("password","-unset-"); connection = new ASConnection(host,port, managementUser, managementPassword); - logFileEventDelegate = new LogFileEventResourceComponentHelper(context); - logFileEventDelegate.startLogFileEventPollers(); } else { connection = ((BaseComponent)context.getParentResourceComponent()).getASConnection(); @@ -146,9 +141,8 @@ public class BaseComponent<T extends ResourceComponent<?>> implements ResourceCo * @see org.rhq.core.pluginapi.inventory.ResourceComponent#stop() */ public void stop() { - if (!(context.getParentResourceComponent() instanceof BaseComponent)) { - logFileEventDelegate.stopLogFileEventPollers(); - } + + }
rhq-commits@lists.fedorahosted.org