You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by we...@apache.org on 2013/11/29 10:42:11 UTC
[1/2] git commit: updated refs/heads/master to 6ab2726
Updated Branches:
refs/heads/master 36201b977 -> 6ab27267b
CLOUDSTACK-5033: set origin ip address in logs if management servers is behind a reverse proxy or load balancer
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5cc47f77
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5cc47f77
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5cc47f77
Branch: refs/heads/master
Commit: 5cc47f77c5d7c1c8c40c5e7cb2f7083fd2ce56cd
Parents: 36201b9
Author: Wei Zhou <w....@leaseweb.com>
Authored: Fri Nov 29 10:39:04 2013 +0100
Committer: Wei Zhou <w....@leaseweb.com>
Committed: Fri Nov 29 10:39:04 2013 +0100
----------------------------------------------------------------------
server/src/com/cloud/api/ApiServlet.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5cc47f77/server/src/com/cloud/api/ApiServlet.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/ApiServlet.java b/server/src/com/cloud/api/ApiServlet.java
index 6a33c14..6386929 100755
--- a/server/src/com/cloud/api/ApiServlet.java
+++ b/server/src/com/cloud/api/ApiServlet.java
@@ -121,7 +121,13 @@ public class ApiServlet extends HttpServlet {
private void processRequestInContext(HttpServletRequest req, HttpServletResponse resp) {
StringBuffer auditTrailSb = new StringBuffer();
- auditTrailSb.append(" " + req.getRemoteAddr());
+ String ipAddress = req.getHeader("X-FORWARDED-FOR");
+ if (ipAddress == null) {
+ ipAddress = req.getRemoteAddr();
+ } else {
+ ipAddress = ipAddress.split(",")[0];
+ }
+ auditTrailSb.append(" " + ipAddress);
auditTrailSb.append(" -- " + req.getMethod() + " ");
// get the response format since we'll need it in a couple of places
String responseType = BaseCmd.RESPONSE_TYPE_XML;
[2/2] git commit: updated refs/heads/master to 6ab2726
Posted by we...@apache.org.
CLOUDSTACK-5310: fix issue: offering display twice in dropdown when create network
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6ab27267
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6ab27267
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6ab27267
Branch: refs/heads/master
Commit: 6ab27267beb11b63d968ca32203352d6a44ce39f
Parents: 5cc47f7
Author: Wei Zhou <w....@leaseweb.com>
Authored: Fri Nov 29 10:40:33 2013 +0100
Committer: Wei Zhou <w....@leaseweb.com>
Committed: Fri Nov 29 10:40:33 2013 +0100
----------------------------------------------------------------------
ui/scripts/network.js | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6ab27267/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index d2b2c4d..6539452 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -540,11 +540,8 @@
domain: {
label: 'label.domain',
select: function(args) {
- var items = [];
$.ajax({
url: createURL("listDomains&listAll=true"),
- dataType: "json",
- async: false,
success: function(json) {
var items = [];
items.push({