You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dm...@apache.org on 2018/10/04 13:05:15 UTC
[camel] branch master updated: CAMEL-12786: Option
readLockLoggingLevel not working for SFTP changed read lock strategy
This is an automated email from the ASF dual-hosted git repository.
dmvolod pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new a81ef66 CAMEL-12786: Option readLockLoggingLevel not working for SFTP changed read lock strategy
a81ef66 is described below
commit a81ef66b8d50e605e4c0b2722eaecee774f88c4c
Author: Dmitry Volodin <dm...@gmail.com>
AuthorDate: Thu Oct 4 15:44:55 2018 +0300
CAMEL-12786: Option readLockLoggingLevel not working for SFTP changed
read lock strategy
---
.../file/remote/strategy/FtpProcessStrategyFactory.java | 9 +++++++++
.../file/remote/strategy/SftpProcessStrategyFactory.java | 9 +++++++++
2 files changed, 18 insertions(+)
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpProcessStrategyFactory.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpProcessStrategyFactory.java
index 0b245ab..39dfd0d 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpProcessStrategyFactory.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpProcessStrategyFactory.java
@@ -20,6 +20,7 @@ import java.util.Map;
import org.apache.camel.CamelContext;
import org.apache.camel.Expression;
+import org.apache.camel.LoggingLevel;
import org.apache.camel.component.file.GenericFileExclusiveReadLockStrategy;
import org.apache.camel.component.file.GenericFileProcessStrategy;
import org.apache.camel.component.file.strategy.GenericFileDeleteProcessStrategy;
@@ -115,6 +116,10 @@ public final class FtpProcessStrategyFactory {
if (readLockMarkerFile != null) {
readLockStrategy.setMarkerFiler(readLockMarkerFile);
}
+ LoggingLevel readLockLoggingLevel = (LoggingLevel) params.get("readLockLoggingLevel");
+ if (readLockLoggingLevel != null) {
+ readLockStrategy.setReadLockLoggingLevel(readLockLoggingLevel);
+ }
return readLockStrategy;
} else if ("changed".equals(readLock)) {
FtpChangedExclusiveReadLockStrategy readLockStrategy = new FtpChangedExclusiveReadLockStrategy();
@@ -142,6 +147,10 @@ public final class FtpProcessStrategyFactory {
if (readLockMarkerFile != null) {
readLockStrategy.setMarkerFiler(readLockMarkerFile);
}
+ LoggingLevel readLockLoggingLevel = (LoggingLevel) params.get("readLockLoggingLevel");
+ if (readLockLoggingLevel != null) {
+ readLockStrategy.setReadLockLoggingLevel(readLockLoggingLevel);
+ }
return readLockStrategy;
}
}
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/SftpProcessStrategyFactory.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/SftpProcessStrategyFactory.java
index 93e5048..57fcebf 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/SftpProcessStrategyFactory.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/SftpProcessStrategyFactory.java
@@ -21,6 +21,7 @@ import java.util.Map;
import com.jcraft.jsch.ChannelSftp;
import org.apache.camel.CamelContext;
import org.apache.camel.Expression;
+import org.apache.camel.LoggingLevel;
import org.apache.camel.component.file.GenericFileExclusiveReadLockStrategy;
import org.apache.camel.component.file.GenericFileProcessStrategy;
import org.apache.camel.component.file.strategy.GenericFileDeleteProcessStrategy;
@@ -111,6 +112,10 @@ public final class SftpProcessStrategyFactory {
if (checkInterval != null) {
readLockStrategy.setCheckInterval(checkInterval);
}
+ LoggingLevel readLockLoggingLevel = (LoggingLevel) params.get("readLockLoggingLevel");
+ if (readLockLoggingLevel != null) {
+ readLockStrategy.setReadLockLoggingLevel(readLockLoggingLevel);
+ }
return readLockStrategy;
} else if ("changed".equals(readLock)) {
SftpChangedExclusiveReadLockStrategy readLockStrategy = new SftpChangedExclusiveReadLockStrategy();
@@ -134,6 +139,10 @@ public final class SftpProcessStrategyFactory {
if (fastExistsCheck != null) {
readLockStrategy.setFastExistsCheck(fastExistsCheck);
}
+ LoggingLevel readLockLoggingLevel = (LoggingLevel) params.get("readLockLoggingLevel");
+ if (readLockLoggingLevel != null) {
+ readLockStrategy.setReadLockLoggingLevel(readLockLoggingLevel);
+ }
return readLockStrategy;
}
}