You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2016/01/27 16:00:24 UTC
[1/2] git commit: updated refs/heads/master to ba722f8
Repository: cloudstack
Updated Branches:
refs/heads/master 366629fb6 -> ba722f849
Add Javadoc to AgentBasedStandaloneConsoleProxyManager
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6ea2b482
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6ea2b482
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6ea2b482
Branch: refs/heads/master
Commit: 6ea2b482f75435cd166229404e71ee490ad67f7f
Parents: 58ba44a
Author: weingartner <ra...@gmail.com>
Authored: Fri Dec 4 10:36:16 2015 -0200
Committer: weingartner <ra...@gmail.com>
Committed: Fri Dec 4 10:36:16 2015 -0200
----------------------------------------------------------------------
...AgentBasedStandaloneConsoleProxyManager.java | 25 +++++++++++++-------
1 file changed, 16 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6ea2b482/server/src/com/cloud/consoleproxy/AgentBasedStandaloneConsoleProxyManager.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/consoleproxy/AgentBasedStandaloneConsoleProxyManager.java b/server/src/com/cloud/consoleproxy/AgentBasedStandaloneConsoleProxyManager.java
index b473f7e..70afd8a 100644
--- a/server/src/com/cloud/consoleproxy/AgentBasedStandaloneConsoleProxyManager.java
+++ b/server/src/com/cloud/consoleproxy/AgentBasedStandaloneConsoleProxyManager.java
@@ -18,7 +18,6 @@ package com.cloud.consoleproxy;
import java.util.List;
-
import org.apache.log4j.Logger;
import com.cloud.host.Host;
@@ -26,6 +25,10 @@ import com.cloud.host.HostVO;
import com.cloud.info.ConsoleProxyInfo;
import com.cloud.vm.UserVmVO;
+/**
+ * This class is intended to replace the use of console proxy VMs managed by the Apache CloudStack (ACS)
+ * to non ACS console proxy services. The documentation that describe its use and requirements can be found in <a href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/QuickCloud">QuickCloud</a>.
+ */
public class AgentBasedStandaloneConsoleProxyManager extends AgentBasedConsoleProxyManager {
private static final Logger s_logger = Logger.getLogger(AgentBasedStandaloneConsoleProxyManager.class);
@@ -58,26 +61,30 @@ public class AgentBasedStandaloneConsoleProxyManager extends AgentBasedConsolePr
}
}
if (allocatedHost == null) {
- if (s_logger.isDebugEnabled())
+ if (s_logger.isDebugEnabled()) {
s_logger.debug("Failed to find a console proxy at host: " + host.getName() + " and in the pod: " + host.getPodId() + " to user vm " + userVmId);
+ }
return null;
}
- if (s_logger.isDebugEnabled())
- s_logger.debug("Assign standalone console proxy running at " + allocatedHost.getName() + " to user vm " + userVmId + " with public IP " +
- allocatedHost.getPublicIpAddress());
+ if (s_logger.isDebugEnabled()) {
+ s_logger.debug("Assign standalone console proxy running at " + allocatedHost.getName() + " to user vm " + userVmId + " with public IP "
+ + allocatedHost.getPublicIpAddress());
+ }
// only private IP, public IP, host id have meaningful values, rest of all are place-holder values
String publicIp = allocatedHost.getPublicIpAddress();
if (publicIp == null) {
- if (s_logger.isDebugEnabled())
- s_logger.debug("Host " + allocatedHost.getName() + "/" + allocatedHost.getPrivateIpAddress() +
- " does not have public interface, we will return its private IP for cosole proxy.");
+ if (s_logger.isDebugEnabled()) {
+ s_logger.debug("Host " + allocatedHost.getName() + "/" + allocatedHost.getPrivateIpAddress()
+ + " does not have public interface, we will return its private IP for cosole proxy.");
+ }
publicIp = allocatedHost.getPrivateIpAddress();
}
int urlPort = _consoleProxyUrlPort;
- if (allocatedHost.getProxyPort() != null && allocatedHost.getProxyPort().intValue() > 0)
+ if (allocatedHost.getProxyPort() != null && allocatedHost.getProxyPort().intValue() > 0) {
urlPort = allocatedHost.getProxyPort().intValue();
+ }
return new ConsoleProxyInfo(_sslEnabled, publicIp, _consoleProxyPort, urlPort, _consoleProxyUrlDomain);
} else {
[2/2] git commit: updated refs/heads/master to ba722f8
Posted by bh...@apache.org.
Merge pull request #855 from rafaelweingartner/master-lrg-cs-hackday-007
Removal of class AgentBasedStandaloneConsoleProxyManagerThe AgentBasedStandaloneConsoleProxyManager class is neither manually
instatiated anywhere in the code nor via Spring. Further checking in the
interface which the class implements, shows that the use for classes
implementing the EventBus interface relies on instances generated by the
Spring framework, which discards the possibility of the class being
created by EJB. Being the class useless, it was discarded.
* pr/855:
Add Javadoc to AgentBasedStandaloneConsoleProxyManager
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ba722f84
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ba722f84
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ba722f84
Branch: refs/heads/master
Commit: ba722f8495851012fd2d6763b54d333dd9776f02
Parents: 366629f 6ea2b48
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Wed Jan 27 16:00:13 2016 +0100
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Wed Jan 27 16:00:13 2016 +0100
----------------------------------------------------------------------
...AgentBasedStandaloneConsoleProxyManager.java | 25 +++++++++++++-------
1 file changed, 16 insertions(+), 9 deletions(-)
----------------------------------------------------------------------