From: <rm...@hy...> - 2008-01-24 01:21:41
|
Author: rmorgan Date: 2008-01-23 17:21:36 -0800 (Wed, 23 Jan 2008) New Revision: 7652 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=7652 Modified: trunk/src/org/hyperic/hq/ha/server/mbean/HAService.java Log: Use PluginsDeployedCallback rather than StartupFinishedCallback, it's a better indication of the server being fully up and operational. [HQ-1127] Modified: trunk/src/org/hyperic/hq/ha/server/mbean/HAService.java =================================================================== --- trunk/src/org/hyperic/hq/ha/server/mbean/HAService.java 2008-01-24 00:19:55 UTC (rev 7651) +++ trunk/src/org/hyperic/hq/ha/server/mbean/HAService.java 2008-01-24 01:21:36 UTC (rev 7652) @@ -28,11 +28,12 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hyperic.hq.product.server.MBeanUtil; -import org.hyperic.hq.application.StartupFinishedCallback; +import org.hyperic.hq.product.server.session.PluginsDeployedCallback; import org.hyperic.hq.application.HQApp; import javax.management.MBeanServer; import javax.management.ObjectName; +import java.util.List; /** * The HAService starts all internal HQ processes. @@ -40,7 +41,7 @@ * @jmx:mbean name="hyperic.jmx:type=Service,name=HAService" */ public class HAService - implements HAServiceMBean, StartupFinishedCallback + implements HAServiceMBean, PluginsDeployedCallback { private static Log _log = LogFactory.getLog(HAService.class); @@ -55,7 +56,7 @@ startAgentAIScanService(server); HQApp.getInstance(). - registerCallbackListener(StartupFinishedCallback.class, this); + registerCallbackListener(PluginsDeployedCallback.class, this); } catch (Exception e) { _log.error("Error starting services", e); @@ -105,7 +106,7 @@ server.invoke(o, method, new Object[] {}, new String[] {}); } - public void startupFinished() { + public void pluginsDeployed(List plugins) { try { MBeanServer server = MBeanUtil.getMBeanServer(); startHeartbeatService(server); |