Repository: flume Updated Branches: refs/heads/flume-1.5 c9598caa3 -> a345f611b
FLUME-2283: Spool Dir source must check interrupt flag before writing to channel (Hari Shreedharan via Jarek Jarcec Cecho) Project: http://git-wip-us.apache.org/repos/asf/flume/repo Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/a345f611 Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/a345f611 Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/a345f611 Branch: refs/heads/flume-1.5 Commit: a345f611ba814c3689420edf4c2cc9b69ba3ac70 Parents: c9598ca Author: Jarek Jarcec Cecho <[email protected]> Authored: Fri Feb 28 15:41:11 2014 -0800 Committer: Jarek Jarcec Cecho <[email protected]> Committed: Fri Feb 28 15:41:59 2014 -0800 ---------------------------------------------------------------------- .../main/java/org/apache/flume/source/SpoolDirectorySource.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flume/blob/a345f611/flume-ng-core/src/main/java/org/apache/flume/source/SpoolDirectorySource.java ---------------------------------------------------------------------- diff --git a/flume-ng-core/src/main/java/org/apache/flume/source/SpoolDirectorySource.java b/flume-ng-core/src/main/java/org/apache/flume/source/SpoolDirectorySource.java index f42ed2d..49d8826 100644 --- a/flume-ng-core/src/main/java/org/apache/flume/source/SpoolDirectorySource.java +++ b/flume-ng-core/src/main/java/org/apache/flume/source/SpoolDirectorySource.java @@ -220,7 +220,7 @@ Configurable, EventDrivenSource { public void run() { int backoffInterval = 250; try { - while (true) { + while (!Thread.interrupted()) { List<Event> events = reader.readEvents(batchSize); if (events.isEmpty()) { break; @@ -248,6 +248,7 @@ Configurable, EventDrivenSource { sourceCounter.addToEventAcceptedCount(events.size()); sourceCounter.incrementAppendBatchAcceptedCount(); } + logger.info("Spooling Directory Source runner has shutdown."); } catch (Throwable t) { logger.error("FATAL: " + SpoolDirectorySource.this.toString() + ": " + "Uncaught exception in SpoolDirectorySource thread. " +
