fix: extension completely hangs after 6|10 retries of fetching contri…

…butors|matching-contexts fixes #861
dis-moi · Apr 24, 2021 · 89aa197 · 89aa197
1 parent 6ca536f
commit 89aa197
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/src/app/background/sagas/refreshMatchingContexts.ts b/src/app/background/sagas/refreshMatchingContexts.ts
@@ -15,7 +15,6 @@ import minutesToMilliseconds from 'app/utils/minutesToMilliseconds';
 export function* refreshMatchingContextsSaga() {
   const callAndRetry = createCallAndRetry({
     maximumRetryDelayInMinutes: 10,
-    maximumAttempts: 10,
     onError: function*(error: Error) {
       yield put(refreshMatchingContextsFailed(error));
     }

diff --git a/src/app/sagas/effects/callAndRetry.ts b/src/app/sagas/effects/callAndRetry.ts
@@ -8,14 +8,13 @@ import minutesToMilliseconds from 'app/utils/minutesToMilliseconds';
 type AnyFunction = (...args: any[]) => any;
 type OnErrorCallback = (error: Error, failures: number) => void;
 type Options = {
-  maximumAttempts: number;
+  maximumAttempts?: number;
   maximumRetryDelayInMinutes: number;
   onError?: OnErrorCallback;
   onFinalError?: OnErrorCallback;
 };
 
 const defaultOptions: Options = {
-  maximumAttempts: 10000,
   maximumRetryDelayInMinutes: 60 * 24
 };
 
@@ -36,7 +35,7 @@ export const createCallAndRetry = (options: Partial<Options>) =>
         if ('onError' in o && o.onError) {
           yield call(o.onError, e, attemptNumber);
         }
-        if (attemptNumber < o.maximumAttempts) {
+        if (!o.maximumAttempts || attemptNumber < o.maximumAttempts) {
           yield delay(
             Math.min(
               secondsToMilliseconds(2 ^ attemptNumber),

diff --git a/src/app/store/sagas/refreshContributors.saga.ts b/src/app/store/sagas/refreshContributors.saga.ts
@@ -5,8 +5,7 @@ import fetchContributors from 'api/fetchContributors';
 
 export default function* refreshContributorsSaga() {
   const callAndRetry = createCallAndRetry({
-    maximumRetryDelayInMinutes: 120,
-    maximumAttempts: 6,
+    maximumRetryDelayInMinutes: 10,
     onError: function*(error: Error) {
       yield put(refreshContributorsFailed(error));
     }