You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by is...@apache.org on 2016/11/14 13:31:49 UTC
svn commit: r1769621 - in
/synapse/trunk/java/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs:
VFSTransportListener.java VFSTransportSender.java
Author: isudana
Date: Mon Nov 14 13:31:49 2016
New Revision: 1769621
URL: http://svn.apache.org/viewvc?rev=1769621&view=rev
Log:
Fix by Vanji for SYNAPSE-1058
Modified:
synapse/trunk/java/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportListener.java
synapse/trunk/java/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportSender.java
Modified: synapse/trunk/java/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportListener.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportListener.java?rev=1769621&r1=1769620&r2=1769621&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportListener.java (original)
+++ synapse/trunk/java/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportListener.java Mon Nov 14 13:31:49 2016
@@ -234,8 +234,8 @@ public class VFSTransportListener extend
metrics.incrementMessagesReceived();
} catch (AxisFault e) {
- logException("Error processing File URI : "
- + fileObject.getName(), e);
+ logException("Error processing File URI : " +
+ VFSUtils.maskURLPassword(fileObject.getName().getURI()), e);
entry.setLastPollState(PollTableEntry.FAILED);
metrics.incrementFaultsReceiving();
}
@@ -259,8 +259,8 @@ public class VFSTransportListener extend
}
}
} else if (log.isDebugEnabled()) {
- log.debug("Couldn't get the lock for processing the file : "
- + fileObject.getName());
+ log.debug("Couldn't get the lock for processing the file : " +
+ VFSUtils.maskURLPassword(fileObject.getName().getURI()));
} else if (isFailedRecord) {
if (entry.isFileLockingEnabled()) {
VFSUtils.releaseLock(fsManager, fileObject);
@@ -313,7 +313,8 @@ public class VFSTransportListener extend
metrics.incrementMessagesReceived();
} catch (Exception e) {
- logException("Error processing File URI : " + child.getName(), e);
+ logException("Error processing File URI : " +
+ VFSUtils.maskURLPassword(child.getName().getURI()), e);
failCount++;
// tell moveOrDeleteAfterProcessing() file failed
entry.setLastPollState(PollTableEntry.FAILED);
@@ -424,7 +425,7 @@ public class VFSTransportListener extend
FileObject dest = moveToDirectory.resolveFile(
prefix + fileObject.getName().getBaseName());
if (log.isDebugEnabled()) {
- log.debug("Moving to file :" + dest.getName().getURI());
+ log.debug("Moving to file :" + VFSUtils.maskURLPassword(dest.getName().getURI()));
}
try {
fileObject.moveTo(dest);
@@ -713,7 +714,7 @@ public class VFSTransportListener extend
FileObject dest = moveToDirectory.resolveFile(
prefix + fileObject.getName().getBaseName());
if (log.isDebugEnabled()) {
- log.debug("The failed file is moving to :" + dest.getName().getURI());
+ log.debug("The failed file is moving to :" + VFSUtils.maskURLPassword(dest.getName().getURI()));
}
try {
fileObject.moveTo(dest);
Modified: synapse/trunk/java/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportSender.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportSender.java?rev=1769621&r1=1769620&r2=1769621&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportSender.java (original)
+++ synapse/trunk/java/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportSender.java Mon Nov 14 13:31:49 2016
@@ -272,13 +272,15 @@ public class VFSTransportSender extends
VFSUtils.releaseLock(fsManager, responseFile);
}
metrics.incrementFaultsSending();
- handleException("IO Error while creating response file : " + responseFile.getName(), e);
+ handleException("IO Error while creating response file : " +
+ VFSUtils.maskURLPassword(responseFile.getName().getURI()), e);
} catch (IOException e) {
if (lockingEnabled) {
VFSUtils.releaseLock(fsManager, responseFile);
}
metrics.incrementFaultsSending();
- handleException("IO Error while creating response file : " + responseFile.getName(), e);
+ handleException("IO Error while creating response file : " +
+ VFSUtils.maskURLPassword(responseFile.getName().getURI()), e);
}
}
@@ -289,9 +291,9 @@ public class VFSTransportSender extends
// wait till we get the lock
while (!VFSUtils.acquireLock(fsManager, responseFile)) {
if (vfsOutInfo.getMaxRetryCount() == tryNum++) {
- handleException("Couldn't send the message to file : "
- + responseFile.getName() + ", unable to acquire the " +
- "lock even after " + tryNum + " retries");
+ handleException("Couldn't send the message to file : " +
+ VFSUtils.maskURLPassword(responseFile.getName().getURI()) +
+ ", unable to acquire the lock even after " + tryNum + " retries");
} else {
log.warn("Couldn't get the lock for the file : "