Menu
▾
▴
[Hyperic-hq-discuss] hq r4528 - in branches/HQ_3_0: src/org/hyperic/hq/common/server/session src/org/hyperic/hq/common/shared src/org/hyperic/hq/measurement/server/session src/org/hyperic/hq/ui/action/admin/config web/WEB-INF/classes
Author: clee Date: 2007-05-24 15:51:41 -0700 (Thu, 24 May 2007) New Revision: 4528 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=4528 Modified: branches/HQ_3_0/src/org/hyperic/hq/common/server/session/ServerConfigManagerEJBImpl.java branches/HQ_3_0/src/org/hyperic/hq/common/shared/HQConstants.java branches/HQ_3_0/src/org/hyperic/hq/measurement/server/session/DataManagerEJBImpl.java branches/HQ_3_0/src/org/hyperic/hq/measurement/server/session/SessionEJB.java branches/HQ_3_0/src/org/hyperic/hq/ui/action/admin/config/EditConfigPrepAction.java branches/HQ_3_0/web/WEB-INF/classes/ApplicationResources.properties Log: [HHQ-815] Improve performance by making OOB configurable so that users can turn it off Modified: branches/HQ_3_0/src/org/hyperic/hq/common/server/session/ServerConfigManagerEJBImpl.java =================================================================== --- branches/HQ_3_0/src/org/hyperic/hq/common/server/session/ServerConfigManagerEJBImpl.java 2007-05-24 22:27:58 UTC (rev 4527) +++ branches/HQ_3_0/src/org/hyperic/hq/common/server/session/ServerConfigManagerEJBImpl.java 2007-05-24 22:51:41 UTC (rev 4528) @@ -211,15 +211,13 @@ } // create properties that are still left in tempProps - if (prefix != null) { - if (tempProps.size() > 0 ) { - Enumeration propsToAdd = tempProps.propertyNames(); - while ( propsToAdd.hasMoreElements() ) { - key = (String) propsToAdd.nextElement(); - propValue = tempProps.getProperty(key); - // create the new property - ccLH.create(prefix, key, propValue, propValue); - } + if (tempProps.size() > 0 ) { + Enumeration propsToAdd = tempProps.propertyNames(); + while ( propsToAdd.hasMoreElements() ) { + key = (String) propsToAdd.nextElement(); + propValue = tempProps.getProperty(key); + // create the new property + ccLH.create(prefix, key, propValue, propValue); } } } catch (FinderException e) { Modified: branches/HQ_3_0/src/org/hyperic/hq/common/shared/HQConstants.java =================================================================== --- branches/HQ_3_0/src/org/hyperic/hq/common/shared/HQConstants.java 2007-05-24 22:27:58 UTC (rev 4527) +++ branches/HQ_3_0/src/org/hyperic/hq/common/shared/HQConstants.java 2007-05-24 22:51:41 UTC (rev 4528) @@ -95,4 +95,5 @@ public static final String JBOSSCACHE = "jboss.cache:service=hqTreeCache"; public static final String EventLogPurge = "EVENT_LOG_PURGE"; + public static final String OOBEnabled = "OOB_ENABLED"; } Modified: branches/HQ_3_0/src/org/hyperic/hq/measurement/server/session/DataManagerEJBImpl.java =================================================================== --- branches/HQ_3_0/src/org/hyperic/hq/measurement/server/session/DataManagerEJBImpl.java 2007-05-24 22:27:58 UTC (rev 4527) +++ branches/HQ_3_0/src/org/hyperic/hq/measurement/server/session/DataManagerEJBImpl.java 2007-05-24 22:51:41 UTC (rev 4528) @@ -47,9 +47,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hyperic.hq.common.SystemException; +import org.hyperic.hq.common.server.session.ServerConfigManagerEJBImpl; import org.hyperic.hq.common.shared.HQConstants; import org.hyperic.hq.common.shared.ProductProperties; -import org.hyperic.hq.common.shared.ServerConfigManagerUtil; import org.hyperic.hq.common.util.Messenger; import org.hyperic.hq.events.EventConstants; import org.hyperic.hq.events.ext.RegisteredTriggers; @@ -503,7 +503,7 @@ _log.debug("Loading default purge intervals"); Properties conf; try { - conf = ServerConfigManagerUtil.getLocalHome().create().getConfig(); + conf = ServerConfigManagerEJBImpl.getOne().getConfig(); } catch (Exception e) { throw new SystemException(e); } @@ -2065,9 +2065,21 @@ * @ejb:create-method */ public void ejbCreate() throws CreateException { - analyzer = (Analyzer) ProductProperties - .getPropertyInstance("hyperic.hq.measurement.analyzer"); - + boolean analyze = true; + try { + Properties conf = ServerConfigManagerEJBImpl.getOne().getConfig(); + if (conf.containsKey(HQConstants.OOBEnabled)) { + analyze = Boolean.getBoolean( + conf.getProperty(HQConstants.OOBEnabled)); + } + } catch (Exception e) { + _log.debug("Error looking up server configs", e); + } finally { + if (analyze) { + analyzer = (Analyzer) ProductProperties + .getPropertyInstance("hyperic.hq.measurement.analyzer"); + } + } } public void ejbPostCreate() {} Modified: branches/HQ_3_0/src/org/hyperic/hq/measurement/server/session/SessionEJB.java =================================================================== --- branches/HQ_3_0/src/org/hyperic/hq/measurement/server/session/SessionEJB.java 2007-05-24 22:27:58 UTC (rev 4527) +++ branches/HQ_3_0/src/org/hyperic/hq/measurement/server/session/SessionEJB.java 2007-05-24 22:51:41 UTC (rev 4528) @@ -25,7 +25,6 @@ package org.hyperic.hq.measurement.server.session; -import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.Iterator; @@ -36,16 +35,9 @@ import javax.naming.InitialContext; import javax.naming.NamingException; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.hyperic.dao.DAOFactory; -import org.hyperic.hq.measurement.server.session.BaselineDAO; -import org.hyperic.hq.measurement.server.session.CategoryDAO; -import org.hyperic.hq.measurement.server.session.DerivedMeasurementDAO; -import org.hyperic.hq.measurement.server.session.MeasurementArgDAO; -import org.hyperic.hq.measurement.server.session.MeasurementTemplateDAO; -import org.hyperic.hq.measurement.server.session.MetricProblemDAO; -import org.hyperic.hq.measurement.server.session.MonitorableTypeDAO; -import org.hyperic.hq.measurement.server.session.RawMeasurementDAO; -import org.hyperic.hq.measurement.server.session.ScheduleRevNumDAO; import org.hyperic.hq.appdef.shared.AgentManagerLocal; import org.hyperic.hq.appdef.shared.AgentManagerUtil; import org.hyperic.hq.appdef.shared.AgentNotFoundException; @@ -64,18 +56,15 @@ import org.hyperic.hq.common.shared.HQConstants; import org.hyperic.hq.measurement.EvaluationException; import org.hyperic.hq.measurement.MeasurementConstants; -import org.hyperic.hq.measurement.server.session.DerivedMeasurement; -import org.hyperic.hq.measurement.server.session.RawMeasurement; import org.hyperic.hq.measurement.data.AggregateObjectMeasurementValue; import org.hyperic.hq.measurement.monitor.MonitorAgentException; import org.hyperic.hq.measurement.server.express.ExpressionManager; import org.hyperic.hq.measurement.shared.DataManagerLocal; import org.hyperic.hq.measurement.shared.DataManagerUtil; -import org.hyperic.hq.measurement.shared.DerivedMeasurementValue; -import org.hyperic.hq.measurement.shared.TemplateManagerLocal; -import org.hyperic.hq.measurement.shared.TemplateManagerUtil; import org.hyperic.hq.measurement.shared.SRNManagerLocal; import org.hyperic.hq.measurement.shared.SRNManagerUtil; +import org.hyperic.hq.measurement.shared.TemplateManagerLocal; +import org.hyperic.hq.measurement.shared.TemplateManagerUtil; import org.hyperic.hq.product.MeasurementPluginManager; import org.hyperic.hq.product.MetricValue; import org.hyperic.hq.product.PluginException; @@ -85,9 +74,6 @@ import org.hyperic.hq.scheduler.shared.SchedulerLocal; import org.hyperic.hq.scheduler.shared.SchedulerUtil; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - /** *This is the base class to Measurement Session EJB's */ Modified: branches/HQ_3_0/src/org/hyperic/hq/ui/action/admin/config/EditConfigPrepAction.java =================================================================== --- branches/HQ_3_0/src/org/hyperic/hq/ui/action/admin/config/EditConfigPrepAction.java 2007-05-24 22:27:58 UTC (rev 4527) +++ branches/HQ_3_0/src/org/hyperic/hq/ui/action/admin/config/EditConfigPrepAction.java 2007-05-24 22:51:41 UTC (rev 4528) @@ -70,12 +70,6 @@ UpdateStatusMode upMode = uboss.getUpdateMode(); cForm.setUpdateMode(upMode.getCode()); - // See if the property exists - if (props.containsKey(HQConstants.SNMPVersion)) { - String ver = props.getProperty(HQConstants.SNMPVersion); - request.setAttribute("snmpEnabled", new Boolean(ver.length() > 0)); - } - return null; } } Modified: branches/HQ_3_0/web/WEB-INF/classes/ApplicationResources.properties =================================================================== --- branches/HQ_3_0/web/WEB-INF/classes/ApplicationResources.properties 2007-05-24 22:27:58 UTC (rev 4527) +++ branches/HQ_3_0/web/WEB-INF/classes/ApplicationResources.properties 2007-05-24 22:51:41 UTC (rev 4528) @@ -510,6 +510,7 @@ admin.settings.BaselineFrequencyLabel=Baseline Frequency: admin.settings.BaselineDataSet=Baseline Dataset: admin.settings.BaselineMinSet=Baseline Minimum Data Points: +admin.settings.OOBEnabled=Track Out-of-Bounds Metrics: admin.settings.RtDataPurge=Delete Response Time Data Older Than: admin.settings.AlertPurge=Delete Alerts Older Than: |