cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From weiz...@apache.org
Subject git commit: updated refs/heads/master to abd4a82
Date Fri, 29 Nov 2013 09:53:02 GMT
Updated Branches:
  refs/heads/master 6ab27267b -> abd4a826e


Revert "CLOUDSTACK-5033: set origin ip address in logs if management servers is behind a reverse
proxy or load balancer"

This reverts commit 5cc47f77c5d7c1c8c40c5e7cb2f7083fd2ce56cd.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/abd4a826
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/abd4a826
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/abd4a826

Branch: refs/heads/master
Commit: abd4a826e9e2d481e8b18be134429c7b37778708
Parents: 6ab2726
Author: Wei Zhou <w.zhou@leaseweb.com>
Authored: Fri Nov 29 10:52:51 2013 +0100
Committer: Wei Zhou <w.zhou@leaseweb.com>
Committed: Fri Nov 29 10:52:51 2013 +0100

----------------------------------------------------------------------
 server/src/com/cloud/api/ApiServlet.java | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/abd4a826/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 6386929..6a33c14 100755
--- a/server/src/com/cloud/api/ApiServlet.java
+++ b/server/src/com/cloud/api/ApiServlet.java
@@ -121,13 +121,7 @@ public class ApiServlet extends HttpServlet {
 
     private void processRequestInContext(HttpServletRequest req, HttpServletResponse resp)
{
         StringBuffer auditTrailSb = new StringBuffer();
-        String ipAddress = req.getHeader("X-FORWARDED-FOR");
-        if (ipAddress == null) {
-            ipAddress = req.getRemoteAddr();
-        } else {
-            ipAddress = ipAddress.split(",")[0];
-        }
-        auditTrailSb.append(" " + ipAddress);
+        auditTrailSb.append(" " + req.getRemoteAddr());
         auditTrailSb.append(" -- " + req.getMethod() + " ");
         // get the response format since we'll need it in a couple of places
         String responseType = BaseCmd.RESPONSE_TYPE_XML;


Mime
View raw message