modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ChildResourceTypeDiscoveryRunner.java
| 65 ++++------
1 file changed, 32 insertions(+), 33 deletions(-)
New commits:
commit b4d3d7b99dc60a4070c046784d3233c53a818db9
Author: alexander.kiefer79(a)googlemail.com <di34475@.dh-com.continental.steel>
Date: Wed Jul 28 10:44:08 2010 +0200
Uncommented the interface implementation check
diff --git
a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ChildResourceTypeDiscoveryRunner.java
b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ChildResourceTypeDiscoveryRunner.java
index d7d87da..6d58302 100644
---
a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ChildResourceTypeDiscoveryRunner.java
+++
b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ChildResourceTypeDiscoveryRunner.java
@@ -79,51 +79,50 @@ public class ChildResourceTypeDiscoveryRunner implements
Callable<Set<ResourceTy
//ChildResourceTypeDiscoveryFacet.class.isAssignableFrom(server.getClass())
//check if child resource implements the interface
ChildResourceTypeDiscoveryFacet
//if (server instanceof ChildResourceTypeDiscoveryFacet)
- if
(ChildResourceTypeDiscoveryFacet.class.isAssignableFrom(server.getClass())) {
- log.info("Server " + server.getName()
- + " implements the interface
ChildResourceTypeDiscoveryFacet");
- //Get ResourceContainer for each server instance
+ //if
(ChildResourceTypeDiscoveryFacet.class.isAssignableFrom(server.getClass())) {
- ResourceContainer container =
im.getResourceContainer(server.getId());
+ // log.info("Server " +
server.getName()
+ // + " implements the interface
ChildResourceTypeDiscoveryFacet");
+ // //Get ResourceContainer for each server
instance
- log.info("Server " + server.getName() + " is
running in ResourceContainer "
- + container.toString());
+ ResourceContainer container =
im.getResourceContainer(server.getId());
- if (container.getResourceComponentState() !=
ResourceContainer.ResourceComponentState.STARTED
- || container.getAvailability() == null
- || container.getAvailability().getAvailabilityType() ==
AvailabilityType.DOWN) {
- // Don't collect metrics for resources that are down
- //if (log.isDebugEnabled()) {
- log.info("ChildType not discoverd for inactive resource
component: "
- + container.getResource());
- //}
- } else {
+ log.info("Server " + server.getName() + " is running
in ResourceContainer " + container.toString());
- try {
+ if (container.getResourceComponentState() !=
ResourceContainer.ResourceComponentState.STARTED
+ || container.getAvailability() == null
+ || container.getAvailability().getAvailabilityType() ==
AvailabilityType.DOWN) {
+ // Don't collect metrics for resources that are down
+ //if (log.isDebugEnabled()) {
+ log.info("ChildType not discoverd for inactive resource
component: " + container.getResource());
+ //}
+ } else {
+
+ try {
- ChildResourceTypeDiscoveryFacet discoveryComponent =
ComponentUtil.getComponent(server
- .getId(), ChildResourceTypeDiscoveryFacet.class,
FacetLockType.READ, 30 * 1000,
- true, true);
+ ChildResourceTypeDiscoveryFacet discoveryComponent =
ComponentUtil.getComponent(server
+ .getId(), ChildResourceTypeDiscoveryFacet.class,
FacetLockType.READ, 30 * 1000, true,
+ true);
- //get Set<ResourceType> --> all the Services
which are running under the specific server
- resourceTypes =
discoverChildResourceTypes(discoveryComponent);
+ //get Set<ResourceType> --> all the Services which
are running under the specific server
+ resourceTypes =
discoverChildResourceTypes(discoveryComponent);
- //Iterate over all the ResourceTypes contained in the
Set
- for (ResourceType type : resourceTypes) {
+ //Iterate over all the ResourceTypes contained in the Set
+ for (ResourceType type : resourceTypes) {
- //Create a new ResourceType in the DB for the
selected type
- im.createNewResourceType(type.getName(),
type.getName() + "Metric");
- }
- } catch (Exception e) {
- throw new RuntimeException("Error submitting service
scan", e);
+ //Create a new ResourceType in the DB for the selected
type
+ im.createNewResourceType(type.getName(), type.getName() +
"Metric");
}
+ } catch (Exception e) {
+ throw new RuntimeException("Error submitting service
scan", e);
}
- } else {
- log.info("Server " + server.getName()
- + " does not implement the interface
ChildResourceTypeDiscoveryFacet");
-
}
+ // } else {
+ // log.info("Server " +
server.getName()
+ // + " does not implement the
interface ChildResourceTypeDiscoveryFacet");
+ //
+ // }
}
}
Show replies by date