modules/plugins/mysql/src/main/java/org/rhq/plugins/mysql/MySqlComponent.java | 19 ++++++---- 1 file changed, 13 insertions(+), 6 deletions(-)
New commits: commit 33544cd9e57622d9484fc8f7a60146c14f9af3de Merge: b097cf3... 08f582b... Author: Heiko W. Rupp hwr@redhat.com Date: Fri Sep 17 10:09:38 2010 +0200
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
commit b097cf35ac6c674747e0fc951103ff77a9d4ee57 Merge: b589ac3... 14fd401... Author: Heiko W. Rupp hwr@redhat.com Date: Thu Sep 16 09:20:23 2010 +0200
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
commit b589ac31791ea0a77666cc638b7e3afa10d91337 Author: Heiko W. Rupp hwr@redhat.com Date: Thu Sep 16 09:18:45 2010 +0200
Don't spam the agent console if the connection fails.
diff --git a/modules/plugins/mysql/src/main/java/org/rhq/plugins/mysql/MySqlComponent.java b/modules/plugins/mysql/src/main/java/org/rhq/plugins/mysql/MySqlComponent.java index e3da0aa..737634b 100644 --- a/modules/plugins/mysql/src/main/java/org/rhq/plugins/mysql/MySqlComponent.java +++ b/modules/plugins/mysql/src/main/java/org/rhq/plugins/mysql/MySqlComponent.java @@ -19,6 +19,8 @@
package org.rhq.plugins.mysql;
+import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.rhq.core.domain.measurement.AvailabilityType; import org.rhq.core.domain.measurement.DataType; import org.rhq.core.domain.measurement.MeasurementDataNumeric; @@ -47,6 +49,7 @@ public class MySqlComponent implements DatabaseComponent, ResourceComponent, Mea
private ResourceContext resourceContext; private Connection connection; + private static final Log log = LogFactory.getLog(MySqlComponent.class);
public void start(ResourceContext resourceContext) throws InvalidPluginConfigurationException, Exception { this.resourceContext = resourceContext; @@ -57,7 +60,7 @@ public class MySqlComponent implements DatabaseComponent, ResourceComponent, Mea try { this.connection.close(); } catch (SQLException e) { - e.printStackTrace(); + log.warn(e); } }
@@ -67,7 +70,9 @@ public class MySqlComponent implements DatabaseComponent, ResourceComponent, Mea getConnection().createStatement().executeQuery("select 1"); return AvailabilityType.UP; } catch (SQLException e) { - e.printStackTrace(); + if (log.isDebugEnabled()) { + log.debug("getAvail failed: " + e.getMessage()); + } return AvailabilityType.DOWN; } } @@ -105,7 +110,9 @@ public class MySqlComponent implements DatabaseComponent, ResourceComponent, Mea this.connection = MySqlDiscoveryComponent.buildConnection(resourceContext.getPluginConfiguration());
} catch (SQLException e) { - e.printStackTrace(); + if (log.isDebugEnabled()) { + log.debug("getAvail failed: " + e.getMessage()); + } } return connection; } @@ -146,9 +153,9 @@ public class MySqlComponent implements DatabaseComponent, ResourceComponent, Mea } } catch (SQLException ex) { // handle any errors - System.out.println("SQLException: " + ex.getMessage()); - System.out.println("SQLState: " + ex.getSQLState()); - System.out.println("VendorError: " + ex.getErrorCode()); + log.info("SQLException: " + ex.getMessage()); + log.info("SQLState: " + ex.getSQLState()); + log.info("VendorError: " + ex.getErrorCode()); } } }
rhq-commits@lists.fedorahosted.org