apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

log sanitation on output of jobs (#8890)

Browse Source
This commit is contained in:
dahn 2024-04-23 12:19:22 +02:00 committed by GitHub
parent 2ca3be41f7
commit 865da730e5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
View File

@ -86,7 +86,6 @@ import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.HttpEntity; import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse; import org.apache.http.HttpResponse;
import org.apache.http.NameValuePair; import org.apache.http.NameValuePair;
@ -169,6 +168,7 @@ import com.cloud.utils.EncryptionUtil;
import com.cloud.utils.LogUtils; import com.cloud.utils.LogUtils;
import com.cloud.utils.NumbersUtil; import com.cloud.utils.NumbersUtil;
import com.cloud.utils.Pair; import com.cloud.utils.Pair;
import com.cloud.utils.StringUtils;
import com.cloud.utils.SwiftUtil; import com.cloud.utils.SwiftUtil;
import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.net.NetUtils; import com.cloud.utils.net.NetUtils;
@ -3106,9 +3106,8 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S
extraOpts.append(name + "=" + nvp.getValue() + ","); extraOpts.append(name + "=" + nvp.getValue() + ",");
} }
if (logger.isDebugEnabled()) { String extraOptions = extraOpts.toString();
logger.error("extraOpts now " + extraOpts); logger.debug("extraOpts now ", ()->StringUtils.cleanString(extraOptions));
}
if (!foundUser || !foundPswd) { if (!foundUser || !foundPswd) {
String errMsg = "Missing user and password from URI. Make sure they" + "are in the query string and separated by '&'. E.g. " String errMsg = "Missing user and password from URI. Make sure they" + "are in the query string and separated by '&'. E.g. "
@ -3116,7 +3115,7 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S
logger.error(errMsg); logger.error(errMsg);
throw new CloudRuntimeException(errMsg); throw new CloudRuntimeException(errMsg);
} }
return extraOpts.toString(); return extraOptions;
} }
protected boolean mountExists(String localRootPath, URI uri) { protected boolean mountExists(String localRootPath, URI uri) {