You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ah...@apache.org on 2013/08/02 20:08:41 UTC
[2/9] git commit: updated refs/heads/master to b484666
Added Configurable interface
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0b1f97d0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0b1f97d0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0b1f97d0
Branch: refs/heads/master
Commit: 0b1f97d048cbcf70eac669ce12bcdaab0e7bf52b
Parents: b8c01cf
Author: Alex Huang <al...@citrix.com>
Authored: Thu Aug 1 09:44:43 2013 -0700
Committer: Alex Huang <al...@citrix.com>
Committed: Fri Aug 2 11:07:54 2013 -0700
----------------------------------------------------------------------
server/src/com/cloud/agent/manager/AgentManagerImpl.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0b1f97d0/server/src/com/cloud/agent/manager/AgentManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/agent/manager/AgentManagerImpl.java b/server/src/com/cloud/agent/manager/AgentManagerImpl.java
index 5be7bf9..b1b862d 100755
--- a/server/src/com/cloud/agent/manager/AgentManagerImpl.java
+++ b/server/src/com/cloud/agent/manager/AgentManagerImpl.java
@@ -43,6 +43,7 @@ import org.apache.log4j.Logger;
import org.apache.cloudstack.config.ConfigDepot;
import org.apache.cloudstack.config.ConfigKey;
import org.apache.cloudstack.config.ConfigValue;
+import org.apache.cloudstack.config.Configurable;
import org.apache.cloudstack.context.ServerContexts;
import org.apache.cloudstack.utils.identity.ManagementServerNode;
@@ -120,7 +121,7 @@ import com.cloud.utils.time.InaccurateClock;
* Implementation of the Agent Manager. This class controls the connection to the agents.
**/
@Local(value = { AgentManager.class })
-public class AgentManagerImpl extends ManagerBase implements AgentManager, HandlerFactory {
+public class AgentManagerImpl extends ManagerBase implements AgentManager, HandlerFactory, Configurable {
protected static final Logger s_logger = Logger.getLogger(AgentManagerImpl.class);
protected static final Logger status_logger = Logger.getLogger(Status.class);
@@ -1577,4 +1578,9 @@ public class AgentManagerImpl extends ManagerBase implements AgentManager, Handl
}
+ @Override
+ public ConfigKey<?>[] getConfigKeys() {
+ return new ConfigKey<?>[] {Workers, Port, PingInterval, PingTimeout, Wait, AlertWait, DirectAgentLoadSize, DirectAgentPoolSize};
+ }
+
}