[Hyperic-hq-discuss] hq r14585 - trunk/plugins/db2jdbc/src/org/hyperic/hq/plugin/db2jdbc

[<gla...@hy...>]

Author: glaullon
Date: 2010-05-10 17:17:02 -0700 (Mon, 10 May 2010)
New Revision: 14585
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14585

Modified:
   trunk/plugins/db2jdbc/src/org/hyperic/hq/plugin/db2jdbc/CachedJDBCMeasurement.java
   trunk/plugins/db2jdbc/src/org/hyperic/hq/plugin/db2jdbc/DBManagerMeasurement.java
   trunk/plugins/db2jdbc/src/org/hyperic/hq/plugin/db2jdbc/DataBaseServerDetector.java
Log:
change some error messages

Modified: trunk/plugins/db2jdbc/src/org/hyperic/hq/plugin/db2jdbc/CachedJDBCMeasurement.java
===================================================================
--- trunk/plugins/db2jdbc/src/org/hyperic/hq/plugin/db2jdbc/CachedJDBCMeasurement.java	2010-05-11 00:12:53 UTC (rev 14584)
+++ trunk/plugins/db2jdbc/src/org/hyperic/hq/plugin/db2jdbc/CachedJDBCMeasurement.java	2010-05-11 00:17:02 UTC (rev 14585)
@@ -46,13 +46,7 @@
                 if (getLog().isDebugEnabled()) {
                     getLog().error("Metric: '" + metric + "' Error='" + ex.getMessage() + "'", ex);
                 }
-                if (metric.getAttributeName().endsWith(AVAIL_ATTR)) {
-                    values = new HashMap();
-                    values.put(metric.getAttributeName(), new MetricValue(Metric.AVAIL_DOWN));
-                    cache.put(key, new CacheEntry(values));
-                } else {
-                    throw ex;
-                }
+                throw ex;
             }
 
         } else {

Modified: trunk/plugins/db2jdbc/src/org/hyperic/hq/plugin/db2jdbc/DBManagerMeasurement.java
===================================================================
--- trunk/plugins/db2jdbc/src/org/hyperic/hq/plugin/db2jdbc/DBManagerMeasurement.java	2010-05-11 00:12:53 UTC (rev 14584)
+++ trunk/plugins/db2jdbc/src/org/hyperic/hq/plugin/db2jdbc/DBManagerMeasurement.java	2010-05-11 00:17:02 UTC (rev 14585)
@@ -14,14 +14,7 @@
 
     protected String getQuery(Metric metric) {
         if (getLog().isDebugEnabled()) {
-            getLog().debug("*******************");
-            getLog().debug("** MT " + metric);
-            getLog().debug("** DN " + metric.getDomainName());
-            getLog().debug("** OP " + metric.getObjectProperties());
-            getLog().debug("** ON " + metric.getObjectName());
-            getLog().debug("** AT " + metric.getAttributeName());
-            getLog().debug("** PR " + metric.getProperties());
-            getLog().debug("*******************");
+            getLog().debug("** metric = " + metric);
         }
         String func = metric.getObjectProperties().getProperty("func");
         return "SELECT * FROM TABLE(" + func + "(-2))";

Modified: trunk/plugins/db2jdbc/src/org/hyperic/hq/plugin/db2jdbc/DataBaseServerDetector.java
===================================================================
--- trunk/plugins/db2jdbc/src/org/hyperic/hq/plugin/db2jdbc/DataBaseServerDetector.java	2010-05-11 00:12:53 UTC (rev 14584)
+++ trunk/plugins/db2jdbc/src/org/hyperic/hq/plugin/db2jdbc/DataBaseServerDetector.java	2010-05-11 00:17:02 UTC (rev 14585)
@@ -150,9 +150,16 @@
             String err = inputStreamAsString(cmd.getErrorStream());
             cmd.waitFor();
 
-            getLog().debug("[createDataBases] sal=" + sal);
-            if (sal.length() == 0) {
-                getLog().debug("[createDataBases] (" + cmd.exitValue() + ") err=" + err);
+            if (getLog().isDebugEnabled()) {
+                if (cmd.exitValue() != 0) {
+                    getLog().error("[createDataBases] exit=" + cmd.exitValue());
+                    getLog().error("[createDataBases] sal=" + sal);
+                } else {
+                    getLog().debug("[createDataBases] sal=" + sal);
+                }
+                if (sal.length() == 0) {
+                    getLog().debug("[createDataBases] (" + cmd.exitValue() + ") err=" + err);
+                }
             }
 
             Matcher m = regExpDataBases.matcher(sal);