🐛 Fixed post scheduling (#8976)

closes #8975 - recursive logic was broken - caused via bf47397
TryGhost · Sep 5, 2017 · d460cf1 · d460cf1
1 parent 69657a1
commit d460cf1
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 19 deletions.
diff --git a/core/server/adapters/scheduling/SchedulingDefault.js b/core/server/adapters/scheduling/SchedulingDefault.js
@@ -54,35 +54,39 @@ SchedulingDefault.prototype.unschedule = function (object) {
  */
 SchedulingDefault.prototype.run = function () {
     var self = this,
-        timeout = null;
+        timeout = null,
+        recursiveRun;
 
     if (this.isRunning) {
         return;
     }
 
     this.isRunning = true;
 
-    timeout = setTimeout(function () {
-        var times = Object.keys(self.allJobs),
-            nextJobs = {};
-
-        times.every(function (time) {
-            if (moment(Number(time)).diff(moment(), 'minutes') <= self.offsetInMinutes) {
-                nextJobs[time] = self.allJobs[time];
-                delete self.allJobs[time];
-                return true;
-            }
+    recursiveRun = function recursiveRun() {
+        timeout = setTimeout(function () {
+            var times = Object.keys(self.allJobs),
+                nextJobs = {};
+
+            times.every(function (time) {
+                if (moment(Number(time)).diff(moment(), 'minutes') <= self.offsetInMinutes) {
+                    nextJobs[time] = self.allJobs[time];
+                    delete self.allJobs[time];
+                    return true;
+                }
+
+                // break!
+                return false;
+            });
 
-            // break!
-            return false;
-        });
+            clearTimeout(timeout);
+            self._execute(nextJobs);
 
-        clearTimeout(timeout);
-        self._execute(nextJobs);
+            recursiveRun();
+        }, self.runTimeoutInMs);
+    };
 
-        // recursive!
-        self.run();
-    }, self.runTimeoutInMs);
+    recursiveRun();
 };
 
 /**

diff --git a/core/test/unit/adapters/scheduling/SchedulingDefault_spec.js b/core/test/unit/adapters/scheduling/SchedulingDefault_spec.js
@@ -84,6 +84,20 @@ describe('Scheduling Default Adapter', function () {
             scope.adapter.run();
         });
 
+        it('ensure recursive run works', function (done) {
+            sandbox.spy(scope.adapter, '_execute');
+
+            scope.adapter.allJobs = {};
+            scope.adapter.runTimeoutInMs = 500;
+            scope.adapter.offsetInMinutes = 2;
+            scope.adapter.run();
+
+            setTimeout(function () {
+                scope.adapter._execute.callCount.should.be.greaterThan(1);
+                done();
+            }, 2000);
+        });
+
         it('execute', function (done) {
             var pinged = 0,
                 jobs = 3,