Author: jtravis
Date: 2007-03-12 16:37:01 -0800 (Mon, 12 Mar 2007)
New Revision: 3721
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=3721
Modified:
trunk/src/org/hyperic/hq/measurement/server/session/DataManagerEJBImpl.java
trunk/src/org/hyperic/hq/measurement/server/session/DataPoint.java
Log:
More debug output when we aren't able to put values into the DB.
Modified: trunk/src/org/hyperic/hq/measurement/server/session/DataManagerEJBImpl.java
===================================================================
--- trunk/src/org/hyperic/hq/measurement/server/session/DataManagerEJBImpl.java 2007-03-13 00:25:37 UTC (rev 3720)
+++ trunk/src/org/hyperic/hq/measurement/server/session/DataManagerEJBImpl.java 2007-03-13 00:37:01 UTC (rev 3721)
@@ -247,7 +247,7 @@
// XXX: Get a better connection here - directly from Hibernate
conn = DBUtil.getConnByContext(getInitialContext(),
DATASOURCE_NAME);
- while (true) {
+ while (true && !left.isEmpty()) {
int numLeft = left.size();
_log.debug("Attempting to insert " + numLeft + " points");
left = insertData(conn, left);
@@ -265,12 +265,13 @@
_log.debug("Update left " + left.size() + " points to process");
- if (numLeft == left.size()) {
+ if (numLeft == left.size() && numLeft != 0) {
+ DataPoint remPt = (DataPoint)left.remove(0);
// There are some entries that we weren't able to do
// anything about ... that sucks.
_log.warn("Unable to do anything about " + numLeft +
" data points. Sorry.");
- break;
+ _log.warn("Throwing away data point " + remPt);
}
}
} catch(Exception e) {
Modified: trunk/src/org/hyperic/hq/measurement/server/session/DataPoint.java
===================================================================
--- trunk/src/org/hyperic/hq/measurement/server/session/DataPoint.java 2007-03-13 00:25:37 UTC (rev 3720)
+++ trunk/src/org/hyperic/hq/measurement/server/session/DataPoint.java 2007-03-13 00:37:01 UTC (rev 3721)
@@ -1,7 +1,5 @@
package org.hyperic.hq.measurement.server.session;
-import java.math.BigDecimal;
-
import org.hyperic.hq.product.MetricValue;
/**
@@ -24,4 +22,9 @@
public MetricValue getMetricValue() {
return _val;
}
+
+ public String toString() {
+ return "id=" + _metricId + " val=" + _val.getValue() +
+ " time=" + _val.getTimestamp();
+ }
}
|
