De-dup the error handling branches.

sourcegraph · Nov 18, 2024 · 7ebfde2 · 7ebfde2
1 parent 13817d2
commit 7ebfde2
Showing 1 changed file with 3 additions and 12 deletions.
diff --git a/lib/shared/src/sourcegraph-api/graphql/cache.ts b/lib/shared/src/sourcegraph-api/graphql/cache.ts
@@ -208,20 +208,13 @@ export class GraphQLResultCache<V> {
         this.fetchTimeMsec = now
 
         let thisFetch: Promise<V | Error> | undefined = undefined
-        const handleError = (error: any): void => {
-            if (this.lastFetch === thisFetch && error instanceof Error) {
-                this.lastResult = error
-                this.retryCount++
-                this.aborts = undefined
-            }
-        }
         try {
-            thisFetch = fetcher(this.aborts.signal)
+            this.lastResult = undefined
+            this.lastFetch = thisFetch = fetcher(this.aborts.signal)
         } catch (error) {
             // We did not succeed in even creating a Promise, so synthesize one.
             this.lastFetch = thisFetch = Promise.reject(error)
-            handleError(error)
-            return thisFetch
+            this.lastResult = error instanceof Error ? error : new Error('unknown error')
         }
         void (async () => {
             try {
@@ -245,8 +238,6 @@ export class GraphQLResultCache<V> {
                 // update the cache's state.
             }
         })()
-        this.lastResult = undefined
-        this.lastFetch = thisFetch
         return thisFetch
     }
 }