From: <tk...@hy...> - 2007-09-19 00:52:59
|
Author: tkeeney Date: 2007-09-18 17:52:54 -0700 (Tue, 18 Sep 2007) New Revision: 5948 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=5948 Modified: branches/HQ_3_1/src/org/hyperic/hq/events/server/session/EventLogManagerEJBImpl.java Log: [HHQ-1082] When deleting event logs, it is not necessarily an error to calculate the 'from' timestamp > 'to' timestamp. This can happen if HQ is configured to delete logs older than x but all event logs are in fact younger than x. Updated debug message to reflect this condition. Modified: branches/HQ_3_1/src/org/hyperic/hq/events/server/session/EventLogManagerEJBImpl.java =================================================================== --- branches/HQ_3_1/src/org/hyperic/hq/events/server/session/EventLogManagerEJBImpl.java 2007-09-19 00:35:25 UTC (rev 5947) +++ branches/HQ_3_1/src/org/hyperic/hq/events/server/session/EventLogManagerEJBImpl.java 2007-09-19 00:52:54 UTC (rev 5948) @@ -41,7 +41,6 @@ import org.hyperic.dao.DAOFactory; import org.hyperic.hq.appdef.shared.AppdefEntityID; import org.hyperic.hq.common.SystemException; -import org.hyperic.hq.common.shared.HQConstants; import org.hyperic.hq.events.AbstractEvent; import org.hyperic.hq.events.ResourceEventInterface; import org.hyperic.hq.events.server.session.EventLog; @@ -65,9 +64,7 @@ public class EventLogManagerEJBImpl extends SessionBase implements SessionBean { private final String logCtx = EventLogManagerEJBImpl.class.getName(); - - private final String DATASOURCE_NAME = HQConstants.DATASOURCE; - + private final String TABLE_EVENT_LOG = "EAM_EVENT_LOG"; private static final int MSGMAX = TrackEvent.MESSAGE_MAXLEN; @@ -240,7 +237,7 @@ } if (from > to) { - log.debug("deleteLogs range is invalid (from > to). Deleting 0 rows."); + log.debug("deleteLogs range has (from > to). There are no rows to delete."); return 0; } |