modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ChildResourceTypeDiscoveryRunner.java
| 18 +---------
modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
| 11 ++++++
modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/NagiosMonitorComponent.java
| 2 +
3 files changed, 16 insertions(+), 15 deletions(-)
New commits:
commit 98ebecc2e9736f8e230983e7dbea02a811fdf3c5
Author: Alexander Kiefer <alexander.kiefer(a)dillinger.biz>
Date: Sat Jul 24 11:35:47 2010 +0200
Added several logging outputs to source code to make debugging easier
and get additional information
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 792a97a..8a53169 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
@@ -39,30 +39,18 @@ public class ChildResourceTypeDiscoveryRunner implements
Callable<Set<ResourceTy
public Set<ResourceType> call() {
+ log.info("<ChildResourceTypeDiscoveryRunner>call() called");
Set<ResourceType> resourceTypes = null;
try {
- //TODO:
- //this.measurementManager.getLock().readLock().lock();
- //report = this.measurementManager.getActiveReport();
long start = System.currentTimeMillis();
InventoryManager im = PluginContainer.getInstance().getInventoryManager();
-
- //Set<ScheduledMeasurementInfo> requests =
this.measurementManager.getNextScheduledSet();
- // if (requests != null) {
- // if ((System.currentTimeMillis() - 30000L) >
requests.iterator().next().getNextCollection()) {
- //
this.measurementManager.incrementLateCollections(requests.size());
- // log.debug("Measurement collection is falling
behind... Missed requested time by ["
- // + (System.currentTimeMillis() -
requests.iterator().next().getNextCollection()) + "ms]");
- //
- // this.measurementManager.reschedule(requests);
- // return report;
- // }
- //Integer resourceId = requests.iterator().next().getResourceId();
+ log.info("InventoryManager instance created");
ResourceContainer container = im.getResourceContainer(this.resourceId);
+ log.info("InventoryManager instance created");
if (container.getResourceComponentState() !=
ResourceContainer.ResourceComponentState.STARTED
|| container.getAvailability() == null
diff --git
a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
index ea9a4e4..d1e103a 100644
---
a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
+++
b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
@@ -982,6 +982,9 @@ public class InventoryManager extends AgentService implements
ContainerService,
* @param resourceId the id of the Resource on which to discover services
*/
public void performServiceScan(int resourceId) {
+
+ log.info("Entering method performServiceScan()!!!!");
+
ResourceContainer resourceContainer = getResourceContainer(resourceId);
if (resourceContainer == null) {
if (log.isDebugEnabled())
@@ -1002,10 +1005,16 @@ public class InventoryManager extends AgentService implements
ContainerService,
* Usage of new implemented ChildResourceTypeDiscoveryRunner
*/
ChildResourceTypeDiscoveryRunner childDiscoveryRunner = new
ChildResourceTypeDiscoveryRunner(resourceId);
+ log.info("ChildResourceTypeDiscoveryRunner instance created with values
" + childDiscoveryRunner.toString());
try {
//get Set<ResourceType>
Set<ResourceType> resourceTypes = inventoryThreadPoolExecutor.submit(
(Callable<Set<ResourceType>>) childDiscoveryRunner).get();
+ log.info("Set<ResourceType> was returned with values: ");
+
+ for (ResourceType type : resourceTypes) {
+ log.info("ResourceType instance: " + type.getName());
+ }
//Iterate over all the ResourceTypes contained in the Set
for (ResourceType type : resourceTypes) {
@@ -2437,8 +2446,10 @@ public class InventoryManager extends AgentService implements
ContainerService,
*/
public void createNewResourceType(String resourceTypeName, String metricName) {
+ log.info("createNewResourceType() called");
//Get DiscoveryServerService object to enable communication to the remote server
DiscoveryServerService serverService =
configuration.getServerServices().getDiscoveryServerService();
+ log.info("DiscoveryServerService instance returned with values " +
serverService.toString());
if (serverService != null) {
//Call method to add a new ResourceType in the server DB
diff --git
a/modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/NagiosMonitorComponent.java
b/modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/NagiosMonitorComponent.java
index e5b67b4..07214f3 100644
---
a/modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/NagiosMonitorComponent.java
+++
b/modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/NagiosMonitorComponent.java
@@ -185,6 +185,8 @@ public class NagiosMonitorComponent implements ResourceComponent,
MeasurementFac
public Set<ResourceType> discoverChildResourceTypes() {
+ log.info("<nagiosMonitorComponent>discoverChildResourceTypes
called");
+
ResourceType parentType = this.context.getResourceType();
ResourceType resourceType = new ResourceType("NewChild",
parentType.getPlugin(), ResourceCategory.SERVICE,
parentType);
Show replies by date