Fix timeouts for short times

Author: sam-lord

lib/fileRotator.js

@@ -37,7 +37,7 @@ class FileRotator extends EventEmitter {
             // Will open existing rather than immediately rotate
             await this._initialiseNewFile();
             const fileInfo = await fs.stat(this._getFileName(0, false));
-            this.emit(FileStartTime, fileInfo.birthtime);
+            this.emit(FileStartTime, fileInfo.birthtimeMs);
         }
     }
 

lib/periodTrigger.js

@@ -80,7 +80,8 @@ class PeriodTrigger extends EventEmitter {
     }
 
     setInitialTime(birthTime) {
-        this.setNextTask(birthTime + this.period);
+        this._rotateAt = birthTime;
+        this.setNextTask();
     }
 
     shutdown() {
@@ -89,11 +90,11 @@ class PeriodTrigger extends EventEmitter {
         }
     }
 
-    setNextTask(override) {
+    setNextTask() {
         if (this._task) {
             clearTimeout(this._task);
         }
-        this._rotateAt = (typeof override === 'number' ? override : getNextRotation(this._period, this._rotateAt));
+        this._rotateAt = getNextRotation(this._period, this._rotateAt);
         this._task = setTimeout(() => {
             this._emitRotate();
             this.setNextTask();

test/filerotate.test.js

@@ -44,4 +44,18 @@ describe('RotatingFileStream', function () {
             await stream.end();
         }, 1000);
     });
+
+    it('Sets up period correctly', async function () {
+        const stream = new RotatingFileStream({
+            period: '1w',
+            ...testConfig
+        });
+        bunyan.createLogger({
+            name: 'foo',
+            streams: [{
+                stream
+            }]
+        });
+        await stream.end();
+    });
 });