[Hyperic-hq-discuss] hq r14054 - trunk/src/org/hyperic/hq/measurement/agent/server

[<pn...@hy...>]

Author: pnguyen
Date: 2009-12-08 14:55:48 -0800 (Tue, 08 Dec 2009)
New Revision: 14054
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14054

Modified:
   trunk/src/org/hyperic/hq/measurement/agent/server/MeasurementCommandsServer.java
Log:
[HHQ-2741] Output the agent schedule to the agent.log during agent startup and agent shutdown

Modified: trunk/src/org/hyperic/hq/measurement/agent/server/MeasurementCommandsServer.java
===================================================================
--- trunk/src/org/hyperic/hq/measurement/agent/server/MeasurementCommandsServer.java	2009-12-08 20:09:01 UTC (rev 14053)
+++ trunk/src/org/hyperic/hq/measurement/agent/server/MeasurementCommandsServer.java	2009-12-08 22:55:48 UTC (rev 14054)
@@ -6,7 +6,7 @@
  * normal use of the program, and does *not* fall under the heading of
  * "derived work".
  * 
- * Copyright (C) [2004, 2005, 2006], Hyperic, Inc.
+ * Copyright (C) [2004-2009], Hyperic, Inc.
  * This file is part of HQ.
  * 
  * HQ is free software; you can redistribute it and/or modify
@@ -206,8 +206,9 @@
             this.storage      = agent.getStorageProvider();
             this.bootConfig   = agent.getBootConfig();
             this.schedStorage = new MeasurementSchedule(this.storage, bootConfig.getBootProperties());
+            logMeasurementSchedule(this.schedStorage);
         } catch(AgentRunningException exc){
-            throw new AgentAssertionException("Agent should be running here");
+            throw new AgentAssertionException("Agent should be running here", exc);
         }
 
         try {
@@ -319,9 +320,40 @@
             }
         }
     }
+    
+    private void logMeasurementSchedule(MeasurementSchedule sched) {
+        if (this.log.isDebugEnabled()) { 
+            try {                
+                Iterator scheduleIter = sched.getMeasurementList();
+                int scheduleSize = 0;
+                
+                while (scheduleIter.hasNext()) { 
+                    ScheduledMeasurement metric = (ScheduledMeasurement) scheduleIter.next();
+                    if (metric != null) {
+                        scheduleSize++;
+                        StringBuffer s = new StringBuffer("Measurement Schedule[")
+                                .append(scheduleSize)
+                                .append("]: entityId=").append(metric.getEntity())
+                                .append(", category=").append(metric.getCategory())
+                                .append(", interval=").append(metric.getInterval())
+                                .append(", derivedId=").append(metric.getDerivedID())
+                                .append(", dsnId=").append(metric.getDsnID())
+                                .append(", dsn=").append(metric.getDSN());
+                    
+                        this.log.debug(s.toString());
+                    }
+                }
+                this.log.debug("Measurement schedule list size=" + scheduleSize);
+            } catch (Exception e) {
+                this.log.error("Error displaying measurement schedule: " + e.getMessage(), e);
+            }
+        }
+    }
 
     public void shutdown(){
         this.log.info("Measurement Commands Server shutting down");
+        logMeasurementSchedule(this.schedStorage);
+
         this.scheduleObject.die();
         this.senderObject.die();