From 254b7d1633f4927e0486c60c0db028bc1e172eb7 Mon Sep 17 00:00:00 2001 From: Art Lowel Date: Mon, 7 Oct 2019 15:35:19 +0200 Subject: [PATCH] increased responseMsToLive from 0 to 10s, to prevent infinite loops --- src/app/core/auth/auth-request.service.ts | 4 ++-- src/app/core/data/data.service.ts | 2 +- src/app/core/data/request.models.ts | 4 ++-- src/app/core/submission/submission-rest.service.spec.ts | 2 +- src/app/core/submission/submission-rest.service.ts | 2 +- src/app/core/submission/workflowitem-data.service.ts | 2 +- src/app/core/submission/workspaceitem-data.service.ts | 2 +- src/app/core/tasks/claimed-task-data.service.ts | 2 +- src/app/core/tasks/pool-task-data.service.ts | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/app/core/auth/auth-request.service.ts b/src/app/core/auth/auth-request.service.ts index e717de9df9..8773b1a9fb 100644 --- a/src/app/core/auth/auth-request.service.ts +++ b/src/app/core/auth/auth-request.service.ts @@ -45,7 +45,7 @@ export class AuthRequestService { distinctUntilChanged(), map((endpointURL: string) => new AuthPostRequest(this.requestService.generateRequestId(), endpointURL, body, options)), map ((request: PostRequest) => { - request.responseMsToLive = 0; + request.responseMsToLive = 10 * 1000; return request; }), tap((request: PostRequest) => this.requestService.configure(request)), @@ -60,7 +60,7 @@ export class AuthRequestService { distinctUntilChanged(), map((endpointURL: string) => new AuthGetRequest(this.requestService.generateRequestId(), endpointURL, options)), map ((request: GetRequest) => { - request.responseMsToLive = 0; + request.responseMsToLive = 10 * 1000; return request; }), tap((request: GetRequest) => this.requestService.configure(request)), diff --git a/src/app/core/data/data.service.ts b/src/app/core/data/data.service.ts index 8362358d61..34215f1a2f 100644 --- a/src/app/core/data/data.service.ts +++ b/src/app/core/data/data.service.ts @@ -205,7 +205,7 @@ export abstract class DataService { first((href: string) => hasValue(href))) .subscribe((href: string) => { const request = new FindAllRequest(this.requestService.generateRequestId(), href, options); - request.responseMsToLive = 0; + request.responseMsToLive = 10 * 1000; this.requestService.configure(request); }); diff --git a/src/app/core/data/request.models.ts b/src/app/core/data/request.models.ts index a2b3423960..647f3a9b13 100644 --- a/src/app/core/data/request.models.ts +++ b/src/app/core/data/request.models.ts @@ -22,7 +22,7 @@ import { TaskResponseParsingService } from '../tasks/task-response-parsing.servi /* tslint:disable:max-classes-per-file */ export abstract class RestRequest { - public responseMsToLive = 0; + public responseMsToLive = 10 * 1000; constructor( public uuid: string, public href: string, @@ -392,7 +392,7 @@ export class TaskDeleteRequest extends DeleteRequest { } export class MyDSpaceRequest extends GetRequest { - public responseMsToLive = 0; + public responseMsToLive = 10 * 1000; } export class RequestError extends Error { diff --git a/src/app/core/submission/submission-rest.service.spec.ts b/src/app/core/submission/submission-rest.service.spec.ts index 8e47bbd994..e6cf3cb6b0 100644 --- a/src/app/core/submission/submission-rest.service.spec.ts +++ b/src/app/core/submission/submission-rest.service.spec.ts @@ -60,7 +60,7 @@ describe('SubmissionRestService test suite', () => { it('should configure a new SubmissionRequest', () => { const expected = new SubmissionRequest(requestService.generateRequestId(), resourceHref); // set cache time to zero - expected.responseMsToLive = 0; + expected.responseMsToLive = 10 * 1000; scheduler.schedule(() => service.getDataById(resourceEndpoint, resourceScope).subscribe()); scheduler.flush(); diff --git a/src/app/core/submission/submission-rest.service.ts b/src/app/core/submission/submission-rest.service.ts index 58aa507314..42bdfbc22d 100644 --- a/src/app/core/submission/submission-rest.service.ts +++ b/src/app/core/submission/submission-rest.service.ts @@ -110,7 +110,7 @@ export class SubmissionRestService { distinctUntilChanged(), map((endpointURL: string) => new SubmissionRequest(requestId, endpointURL)), map ((request: RestRequest) => { - request.responseMsToLive = 0; + request.responseMsToLive = 10 * 1000; return request; }), tap((request: RestRequest) => this.requestService.configure(request)), diff --git a/src/app/core/submission/workflowitem-data.service.ts b/src/app/core/submission/workflowitem-data.service.ts index 218de9c81a..43c4aecafe 100644 --- a/src/app/core/submission/workflowitem-data.service.ts +++ b/src/app/core/submission/workflowitem-data.service.ts @@ -20,7 +20,7 @@ import { DSOChangeAnalyzer } from '../data/dso-change-analyzer.service'; @Injectable() export class WorkflowItemDataService extends DataService { protected linkPath = 'workflowitems'; - protected responseMsToLive = 0; + protected responseMsToLive = 10 * 1000; constructor( protected comparator: DSOChangeAnalyzer, diff --git a/src/app/core/submission/workspaceitem-data.service.ts b/src/app/core/submission/workspaceitem-data.service.ts index 70e07edd5e..4d388ec513 100644 --- a/src/app/core/submission/workspaceitem-data.service.ts +++ b/src/app/core/submission/workspaceitem-data.service.ts @@ -20,7 +20,7 @@ import { WorkspaceItem } from './models/workspaceitem.model'; @Injectable() export class WorkspaceitemDataService extends DataService { protected linkPath = 'workspaceitems'; - protected responseMsToLive = 0; + protected responseMsToLive = 10 * 1000; constructor( protected comparator: DSOChangeAnalyzer, diff --git a/src/app/core/tasks/claimed-task-data.service.ts b/src/app/core/tasks/claimed-task-data.service.ts index fecffaabe1..76e5e769d7 100644 --- a/src/app/core/tasks/claimed-task-data.service.ts +++ b/src/app/core/tasks/claimed-task-data.service.ts @@ -22,7 +22,7 @@ import { ProcessTaskResponse } from './models/process-task-response'; @Injectable() export class ClaimedTaskDataService extends TasksService { - protected responseMsToLive = 0; + protected responseMsToLive = 10 * 1000; /** * The endpoint link name diff --git a/src/app/core/tasks/pool-task-data.service.ts b/src/app/core/tasks/pool-task-data.service.ts index 62689c4cfc..0e7704336d 100644 --- a/src/app/core/tasks/pool-task-data.service.ts +++ b/src/app/core/tasks/pool-task-data.service.ts @@ -27,7 +27,7 @@ export class PoolTaskDataService extends TasksService { */ protected linkPath = 'pooltasks'; - protected responseMsToLive = 0; + protected responseMsToLive = 10 * 1000; /** * Initialize instance variables