sasjs/adapter
1
0
Fork 0
mirror of https://github.com/sasjs/adapter.git synced 2025-12-15 18:54:36 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #359 from sasjs/retry-state-error

Browse Source 
fix(job-state-poll): Continue poll regardless of errors
This commit is contained in:
Allan Bowe
2021-05-11 12:26:16 +03:00
committed by GitHub
parent dffcb66d54 8f3a7f33f8
commit 8c30cbff13
1 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/SASViyaApiClient.ts
View File

@@ -1078,6 +1078,7 @@ export class SASViyaApiClient {
) {
let POLL_INTERVAL = 300
let MAX_POLL_COUNT = 1000
let MAX_ERROR_COUNT = 5
if (pollOptions) {
POLL_INTERVAL = pollOptions.POLL_INTERVAL || POLL_INTERVAL
@@ -1086,6 +1087,7 @@ export class SASViyaApiClient {
let postedJobState = ''
let pollCount = 0
let errorCount = 0
const headers: any = {
'Content-Type': 'application/json',
'If-None-Match': etag
@@ -1107,7 +1109,11 @@ export class SASViyaApiClient {
this.debug
)
.catch((err) => {
throw prefixMessage(err, 'Error while getting job state. ')
console.error(
`Error fetching job state from ${this.serverUrl}${stateLink.href}. Starting poll, assuming job to be running.`,
err
)
return { result: 'unavailable' }
})
const currentState = state.trim()
@@ -1122,7 +1128,8 @@ export class SASViyaApiClient {
if (
postedJobState === 'running' ||
postedJobState === '' ||
postedJobState === 'pending'
postedJobState === 'pending' ||
postedJobState === 'unavailable'
) {
if (stateLink) {
const { result: jobState } = await this.requestClient
@@ -1134,13 +1141,27 @@ export class SASViyaApiClient {
this.debug
)
.catch((err) => {
throw prefixMessage(
err,
'Error while getting job state after interval. '
errorCount++
if (
pollCount >= MAX_POLL_COUNT ||
errorCount >= MAX_ERROR_COUNT
) {
throw prefixMessage(
err,
'Error while getting job state after interval. '
)
}
console.error(
`Error fetching job state from ${this.serverUrl}${stateLink.href}. Resuming poll, assuming job to be running.`,
err
)
return { result: 'unavailable' }
})
postedJobState = jobState.trim()
if (postedJobState != 'unavailable' && errorCount > 0) {
errorCount = 0
}
if (this.debug && printedState !== postedJobState) {
console.log('Polling job status...')