|
86 | 86 | import org.apache.commons.io.FileUtils; |
87 | 87 | import org.apache.commons.io.FilenameUtils; |
88 | 88 | import org.apache.commons.lang3.BooleanUtils; |
89 | | -import org.apache.commons.lang3.StringUtils; |
90 | 89 | import org.apache.http.HttpEntity; |
91 | 90 | import org.apache.http.HttpResponse; |
92 | 91 | import org.apache.http.NameValuePair; |
|
169 | 168 | import com.cloud.utils.LogUtils; |
170 | 169 | import com.cloud.utils.NumbersUtil; |
171 | 170 | import com.cloud.utils.Pair; |
| 171 | +import com.cloud.utils.StringUtils; |
172 | 172 | import com.cloud.utils.SwiftUtil; |
173 | 173 | import com.cloud.utils.exception.CloudRuntimeException; |
174 | 174 | import com.cloud.utils.net.NetUtils; |
@@ -3106,17 +3106,16 @@ protected String parseCifsMountOptions(URI uri) { |
3106 | 3106 | extraOpts.append(name + "=" + nvp.getValue() + ","); |
3107 | 3107 | } |
3108 | 3108 |
|
3109 | | - if (logger.isDebugEnabled()) { |
3110 | | - logger.error("extraOpts now " + extraOpts); |
3111 | | - } |
| 3109 | + String extraOptions = extraOpts.toString(); |
| 3110 | + logger.debug("extraOpts now ", ()->StringUtils.cleanString(extraOptions)); |
3112 | 3111 |
|
3113 | 3112 | if (!foundUser || !foundPswd) { |
3114 | 3113 | String errMsg = "Missing user and password from URI. Make sure they" + "are in the query string and separated by '&'. E.g. " |
3115 | 3114 | + "cifs://example.com/some_share?user=foo&password=bar"; |
3116 | 3115 | logger.error(errMsg); |
3117 | 3116 | throw new CloudRuntimeException(errMsg); |
3118 | 3117 | } |
3119 | | - return extraOpts.toString(); |
| 3118 | + return extraOptions; |
3120 | 3119 | } |
3121 | 3120 |
|
3122 | 3121 | protected boolean mountExists(String localRootPath, URI uri) { |
|
0 commit comments