dont wait 1hr for new data in log rotated files, allow rescan to pick…

… up new file
logdna · Jan 5, 2018 · cadc2c7 · cadc2c7
1 parent d64ac07
commit cadc2c7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/lib/file-utilities.js b/lib/file-utilities.js
@@ -134,8 +134,11 @@ module.exports.streamFiles = function(config, logfiles, callback) {
                 log('Tail error: ' + file + ': ' + err);
             });
 
-            tail.on('nofile', () => {
-                log('File does not exist, stopped tailing: ' + file + ' after ' + tail.timeout + 'ms');
+            tail.on('end', (err) => {
+                if (err) {
+                    log('File does not exist, stopped tailing: ' + file + ' after ' + tail.timeout + 'ms');
+                    _.pull(exports.files, file);
+                }
             });
 
             tail.on('rename', () => {

diff --git a/lib/tailreadstream/tailreadstream.js b/lib/tailreadstream/tailreadstream.js
@@ -10,7 +10,7 @@ const Readable = require('stream').Readable;
 
 const DEFAULT_WATCH_INTERVAL = 1000;
 const DEFAULT_READ_INTERVAL = 1000;
-const DEFAULT_READ_TIMEOUT = 3600000; // 1hr timeout
+const DEFAULT_READ_TIMEOUT = 300000; // 5min timeout
 const DEFAULT_TAILHEAD_SIZE = 8192; // 8kb
 const DEFAULT_TAILHEAD_AGE = 60000; // 1min
 const DOES_NOT_EXIST_ERROR = 'ENOENT';
@@ -114,7 +114,8 @@ class TailReadStream extends Readable {
 
                 if (that._hasTimedOut()) {
                     debug(that._filepath + ': file does not exist, timed out after ' + that._timeout + 'ms');
-                    that.emit('nofile', err);
+                    that.destroy();
+                    that.emit('end', err);
                     return;
                 }
 
@@ -147,7 +148,8 @@ class TailReadStream extends Readable {
 
         if (this._hasTimedOut()) {
             debug(this._filepath + ': file no longer exists, timed out after ' + this._timeout + 'ms');
-            this.emit('nofile', error);
+            this.destroy();
+            this.emit('end', error);
             return;
         }