Преглед на файлове

fix feeds added when idle not queued for next job

Mike L преди 3 години
родител
ревизия
10922f0eb0
променени са 2 файла, в които са добавени 4 реда и са изтрити 4 реда
  1. 2 2
      dist/twitter.js
  2. 2 2
      src/twitter.ts

+ 2 - 2
dist/twitter.js

@@ -314,7 +314,7 @@ class default_1 {
                     fs.writeFileSync(path.resolve(this.lockfile), JSON.stringify(lock));
                 }
             });
-            const queuedFeeds = lock.feed.slice(0, lock.workon + 1).reverse();
+            const queuedFeeds = lock.feed.slice(0, (lock.workon + 1) || undefined).reverse();
             utils_1.chainPromises(utils_1.Arr.chunk(queuedFeeds, 5).map((arr, i) => () => Promise.all(arr.map((currentFeed, j) => {
                 const workon = (queuedFeeds.length - 1) - (i * 5 + j);
                 fs.writeFileSync(path.resolve(this.lockfile), JSON.stringify(lock));
@@ -353,7 +353,7 @@ class default_1 {
                     return this.workOnMedia(mediaItems, this.sendMedia(`thread ${currentFeed}`, ...currentThread.subscribers))
                         .then(updateDate).then(updateOffset);
                 }).then(() => {
-                    lock.workon = (workon || lock.feed.length) - 1;
+                    lock.workon = workon - 1;
                     if (j === arr.length - 1) {
                         logger.info(`batch job #${workon}-${workon + j} completed after ${getTimerTime()} ms`);
                     }

+ 2 - 2
src/twitter.ts

@@ -522,7 +522,7 @@ export default class {
       }
     });
     
-    const queuedFeeds = lock.feed.slice(0, lock.workon + 1).reverse();
+    const queuedFeeds = lock.feed.slice(0, (lock.workon + 1) || undefined).reverse();
     chainPromises(Arr.chunk(queuedFeeds, 5).map((arr, i) =>
       () => Promise.all(arr.map((currentFeed, j) => {
         const workon = (queuedFeeds.length - 1) - (i * 5 + j);
@@ -559,7 +559,7 @@ export default class {
           return this.workOnMedia(mediaItems, this.sendMedia(`thread ${currentFeed}`, ...currentThread.subscribers))
             .then(updateDate).then(updateOffset);
         }).then(() => {
-          lock.workon = (workon || lock.feed.length) - 1;
+          lock.workon = workon - 1;
           if (j === arr.length - 1) {
             logger.info(`batch job #${workon}-${workon + j} completed after ${getTimerTime()} ms`);
           }