From 3689b9da41ffd05e6e84a4438a1848a6aa8e1c37 Mon Sep 17 00:00:00 2001 From: lujiefsi Date: Mon, 14 Dec 2020 14:09:54 +0800 Subject: [PATCH] jobs: The patch remove the password from resultObject and make it be humanreadable (#4538) This PR fixes CLOUDSTACK-10425. Co-authored-by: lujie --- .../cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java b/framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java index f1398a344a5..54ce065f9cd 100644 --- a/framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java +++ b/framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java @@ -257,9 +257,9 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager, @Override @DB public void completeAsyncJob(final long jobId, final Status jobStatus, final int resultCode, final String resultObject) { + String resultObj = null; if (s_logger.isDebugEnabled()) { - String resultObj = obfuscatePassword(resultObject, HidePassword.value()); - resultObj = convertHumanReadableJson(resultObj); + resultObj = convertHumanReadableJson(obfuscatePassword(resultObject, HidePassword.value())); s_logger.debug("Complete async job-" + jobId + ", jobStatus: " + jobStatus + ", resultCode: " + resultCode + ", result: " + resultObj); } @@ -268,7 +268,7 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager, if (job == null) { if (s_logger.isDebugEnabled()) { s_logger.debug("job-" + jobId + " no longer exists, we just log completion info here. " + jobStatus + ", resultCode: " + resultCode + ", result: " + - resultObject); + resultObj); } // still purge item from queue to avoid any blocking _queueMgr.purgeAsyncJobQueueItemId(jobId);