You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by sl...@apache.org on 2011/02/09 15:03:39 UTC
svn commit: r1068896 - in /camel/trunk/components/camel-stream/src:
main/java/org/apache/camel/component/stream/
test/java/org/apache/camel/component/stream/
Author: slewis
Date: Wed Feb 9 14:03:38 2011
New Revision: 1068896
URL: http://svn.apache.org/viewvc?rev=1068896&view=rev
Log:
CAMEL-2853 - camel-stream - tailing logfile does not seem to work when logfile is rolled over update
Modified:
camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamConsumer.java
camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamEndpoint.java
camel/trunk/components/camel-stream/src/test/java/org/apache/camel/component/stream/ScanStreamFileTest.java
Modified: camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamConsumer.java?rev=1068896&r1=1068895&r2=1068896&view=diff
==============================================================================
--- camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamConsumer.java (original)
+++ camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamConsumer.java Wed Feb 9 14:03:38 2011
@@ -124,7 +124,7 @@ public class StreamConsumer extends Defa
boolean eos = line == null;
if (!eos && isRunAllowed()) {
processLine(line);
- } else if (eos && isRunAllowed()) {
+ } else if (eos && isRunAllowed() && endpoint.isRetry() ) {
//try and re-open stream
br = initializeStream();
}
Modified: camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamEndpoint.java?rev=1068896&r1=1068895&r2=1068896&view=diff
==============================================================================
--- camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamEndpoint.java (original)
+++ camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamEndpoint.java Wed Feb 9 14:03:38 2011
@@ -31,6 +31,7 @@ public class StreamEndpoint extends Defa
private String fileName;
private boolean scanStream;
+ private boolean retry;
private long scanStreamDelay;
private String url;
private long delay;
@@ -127,6 +128,14 @@ public class StreamEndpoint extends Defa
this.scanStream = scanStream;
}
+ public boolean isRetry() {
+ return retry;
+ }
+
+ public void setRetry(boolean retry) {
+ this.retry = retry;
+ }
+
public long getScanStreamDelay() {
return scanStreamDelay;
}
Modified: camel/trunk/components/camel-stream/src/test/java/org/apache/camel/component/stream/ScanStreamFileTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-stream/src/test/java/org/apache/camel/component/stream/ScanStreamFileTest.java?rev=1068896&r1=1068895&r2=1068896&view=diff
==============================================================================
--- camel/trunk/components/camel-stream/src/test/java/org/apache/camel/component/stream/ScanStreamFileTest.java (original)
+++ camel/trunk/components/camel-stream/src/test/java/org/apache/camel/component/stream/ScanStreamFileTest.java Wed Feb 9 14:03:38 2011
@@ -92,7 +92,7 @@ public class ScanStreamFileTest extends
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("stream:file?fileName=target/stream/scanstreamfile.txt&scanStream=true&scanStreamDelay=100").to("mock:result");
+ from("stream:file?fileName=target/stream/scanstreamfile.txt&scanStream=true&scanStreamDelay=100&retry=true").to("mock:result");
}
};
}