Skip to content

Commit 865da73

Browse files
authored
log sanitation on output of jobs (#8890)
1 parent 2ca3be4 commit 865da73

1 file changed

Lines changed: 4 additions & 5 deletions

File tree

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@
8686
import org.apache.commons.io.FileUtils;
8787
import org.apache.commons.io.FilenameUtils;
8888
import org.apache.commons.lang3.BooleanUtils;
89-
import org.apache.commons.lang3.StringUtils;
9089
import org.apache.http.HttpEntity;
9190
import org.apache.http.HttpResponse;
9291
import org.apache.http.NameValuePair;
@@ -169,6 +168,7 @@
169168
import com.cloud.utils.LogUtils;
170169
import com.cloud.utils.NumbersUtil;
171170
import com.cloud.utils.Pair;
171+
import com.cloud.utils.StringUtils;
172172
import com.cloud.utils.SwiftUtil;
173173
import com.cloud.utils.exception.CloudRuntimeException;
174174
import com.cloud.utils.net.NetUtils;
@@ -3106,17 +3106,16 @@ protected String parseCifsMountOptions(URI uri) {
31063106
extraOpts.append(name + "=" + nvp.getValue() + ",");
31073107
}
31083108

3109-
if (logger.isDebugEnabled()) {
3110-
logger.error("extraOpts now " + extraOpts);
3111-
}
3109+
String extraOptions = extraOpts.toString();
3110+
logger.debug("extraOpts now ", ()->StringUtils.cleanString(extraOptions));
31123111

31133112
if (!foundUser || !foundPswd) {
31143113
String errMsg = "Missing user and password from URI. Make sure they" + "are in the query string and separated by '&'. E.g. "
31153114
+ "cifs://example.com/some_share?user=foo&password=bar";
31163115
logger.error(errMsg);
31173116
throw new CloudRuntimeException(errMsg);
31183117
}
3119-
return extraOpts.toString();
3118+
return extraOptions;
31203119
}
31213120

31223121
protected boolean mountExists(String localRootPath, URI uri) {

0 commit comments

Comments
 (0)