cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [7/7] git commit: updated refs/heads/4.5 to 48c1ffd
Date Fri, 17 Apr 2015 14:06:16 GMT
CLOUDSTACK-8108. vCenter admin name is logged in clear text.
Revert back to TRACE logging while retrieving and recycling VMware context from the context
pool.

(cherry picked from commit 0f224c858fd3612c66632ba3476bfc3f1f71e1df)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>


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

Branch: refs/heads/4.5
Commit: 48c1ffd740f4667ff0534a9a390784092825a202
Parents: 8aabab8
Author: Likitha Shetty <likitha.shetty@citrix.com>
Authored: Wed Oct 22 14:40:39 2014 +0530
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Fri Apr 17 15:58:30 2015 +0200

----------------------------------------------------------------------
 .../cloud/hypervisor/vmware/util/VmwareContextPool.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48c1ffd7/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContextPool.java
----------------------------------------------------------------------
diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContextPool.java b/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContextPool.java
index e28c974..c97c01f 100644
--- a/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContextPool.java
+++ b/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContextPool.java
@@ -83,8 +83,8 @@ public class VmwareContextPool {
                 VmwareContext context = l.remove(0);
                 context.setPoolInfo(this, poolKey);
 
-                if (s_logger.isInfoEnabled())
-                    s_logger.info("Return a VmwareContext from the idle pool: " + poolKey
+ ". current pool size: " + l.size() + ", outstanding count: " +
+                if (s_logger.isTraceEnabled())
+                    s_logger.trace("Return a VmwareContext from the idle pool: " + poolKey
+ ". current pool size: " + l.size() + ", outstanding count: " +
                         VmwareContext.getOutstandingContextCount());
                 return context;
             }
@@ -108,12 +108,12 @@ public class VmwareContextPool {
                 context.clearStockObjects();
                 l.add(context);
 
-                if (s_logger.isInfoEnabled())
-                    s_logger.info("Recycle VmwareContext into idle pool: " + context.getPoolKey()
+ ", current idle pool size: " + l.size() + ", outstanding count: " +
+                if (s_logger.isTraceEnabled())
+                    s_logger.trace("Recycle VmwareContext into idle pool: " + context.getPoolKey()
+ ", current idle pool size: " + l.size() + ", outstanding count: " +
                         VmwareContext.getOutstandingContextCount());
             } else {
-                if (s_logger.isInfoEnabled())
-                    s_logger.info("VmwareContextPool queue exceeds limits, queue size: "
+ l.size());
+                if (s_logger.isTraceEnabled())
+                    s_logger.trace("VmwareContextPool queue exceeds limits, queue size: "
+ l.size());
                 context.close();
             }
         }


Mime
View raw message