Merge pull request #19 from starsprung/fix-filtering-bug

Fixed issue where checkpoint would not advance if all logs were filtered out

package.json

@@ -1,6 +1,6 @@
 {
   "name": "auth0-log-extension-tools",
-  "version": "1.3.5",
+  "version": "1.3.6",
   "description": "A set of tools for logging",
   "main": "src/index.js",
   "dependencies": {

src/processor.js

@@ -152,7 +152,7 @@ LogsProcessor.prototype.run = function(handler) {
         options.logger.debug('Processor run complete. Logs processed:', status.logsProcessed);
       }
 
-      if (status.logsProcessed > 0) {
+      if (checkpoint !== status.startCheckpoint) {
         const week = 604800000;
         const currentDate = new Date().getTime();
         const timeDiff = currentDate - lastLogDate;

src/stream.js

@@ -22,6 +22,7 @@ function LogsApiStream(options) {
   this.previousCheckpoint = options.checkpointId || null;
   this.lastCheckpoint = options.checkpointId || null;
   this.status = {
+    startCheckpoint: options.checkpointId || null,
     start: new Date(),
     end: null,
     logsProcessed: 0

tests/lib/processor.tests.js

@@ -247,6 +247,26 @@ describe('LogsProcessor', () => {
         });
     });
 
+    it('should update checkpoint even if no events match given logTypes', () => {
+      helpers.mocks.logs({ delay: 550, type: 'sapi' });
+
+
+      const storage = webtaskStorage();
+      const getAsync = Promise.promisify(storage.get);
+
+      const processor = createProcessor(null, { logTypes: [ 's', 'ss' ] }, storage);
+      return processor.run((logs, cb) => setTimeout(cb()))
+        .then(() => getAsync())
+        .then((storageState) => {
+          expect(storageState.checkpointId).to.equal('100');
+          expect(storageState.logs[0].logsProcessed).to.equal(0);
+          expect(storageState.logs[0].checkpoint).to.equal('100');
+          expect(storageState.logs[0].start).to.be.an.instanceof(Date);
+          expect(storageState.logs[0].end).to.be.an.instanceof(Date);
+        });
+    });
+
+
     it('should return report', () => {
       const data = {
         logs: [