From 0f10d3690b324a83dd2b82f7d33b3ea84e44e4e4 Mon Sep 17 00:00:00 2001 From: Jayapal Date: Fri, 13 Mar 2015 13:38:23 +0530 Subject: [PATCH] Avoid logging password when adding srx device Signed-off-by: Rohit Yadav (cherry picked from commit 32fe64ce1bef9c496ac13f405442d30589c9b34c) Signed-off-by: Rohit Yadav --- .../cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java index 45e951a5e08..efcce12700c 100644 --- a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java +++ b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java @@ -61,6 +61,7 @@ import com.cloud.cluster.ManagementServerHost; import com.cloud.utils.DateUtil; import com.cloud.utils.Pair; import com.cloud.utils.Predicate; +import com.cloud.utils.StringUtils; import com.cloud.utils.component.ComponentLifecycle; import com.cloud.utils.component.ManagerBase; import com.cloud.utils.concurrency.NamedThreadFactory; @@ -173,7 +174,7 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager, publishOnEventBus(job, "submit"); scheduleExecution(job, scheduleJobExecutionInContext); if (s_logger.isDebugEnabled()) { - s_logger.debug("submit async job-" + job.getId() + ", details: " + job.toString()); + s_logger.debug("submit async job-" + job.getId() + ", details: " + StringUtils.cleanString(job.toString())); } return job.getId(); } @@ -483,7 +484,7 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager, // execute the job if (s_logger.isDebugEnabled()) { - s_logger.debug("Executing " + job); + s_logger.debug("Executing " + StringUtils.cleanString(job.toString())); } if ((getAndResetPendingSignals(job) & AsyncJob.Constants.SIGNAL_MASK_WAKEUP) != 0) {