From 040692455ead6433d1ec591fa80b82568399d12f Mon Sep 17 00:00:00 2001
From: Art Lowel <art.lowel@atmire.com>
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 ++--
.../submission-rest.service.spec.ts | 2 +-
.../submission/submission-rest.service.ts | 2 +-
.../submission/workflowitem-data.service.ts | 2 +-
.../submission/workspaceitem-data.service.ts | 2 +-
.../core/tasks/claimed-task-data.service.ts | 15 +--------------
src/app/core/tasks/pool-task-data.service.ts | 19 +------------------
9 files changed, 11 insertions(+), 41 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<T extends CacheableObject> {
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 43ab9e58e7..766ad75cde 100644
--- a/src/app/core/data/request.models.ts
+++ b/src/app/core/data/request.models.ts
@@ -23,7 +23,7 @@ import { MappedCollectionsReponseParsingService } from './mapped-collections-rep
/* tslint:disable:max-classes-per-file */
export abstract class RestRequest {
- public responseMsToLive = 0;
+ public responseMsToLive = 10 * 1000;
constructor(
public uuid: string,
public href: string,
@@ -404,7 +404,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<WorkflowItem> {
protected linkPath = 'workflowitems';
- protected responseMsToLive = 0;
+ protected responseMsToLive = 10 * 1000;
constructor(
protected comparator: DSOChangeAnalyzer<WorkflowItem>,
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<WorkspaceItem> {
protected linkPath = 'workspaceitems';
- protected responseMsToLive = 0;
+ protected responseMsToLive = 10 * 1000;
constructor(
protected comparator: DSOChangeAnalyzer<WorkspaceItem>,
diff --git a/src/app/core/tasks/claimed-task-data.service.ts b/src/app/core/tasks/claimed-task-data.service.ts
index 6341c2713a..cc6a9d2d20 100644
--- a/src/app/core/tasks/claimed-task-data.service.ts
+++ b/src/app/core/tasks/claimed-task-data.service.ts
@@ -21,20 +21,7 @@ import { ProcessTaskResponse } from './models/process-task-response';
*/
@Injectable()
export class ClaimedTaskDataService extends TasksService<ClaimedTask> {
-
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
- protected responseMsToLive = 0;
-=======
- protected resetMsToLive = true;
->>>>>>> Setting cache period to zero for all instances where forceBypassCache was previously true.
-=======
- protected resetMsToLive = 0;
->>>>>>> Sets responseMsToLive to zero in some dataService methods and adds ability to reset the responseMsToLive value in subclasses.
-=======
- protected responseMsToLive = 0;
->>>>>>> Renamed cache property and replaced conditional with hasValue.
+ 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 f763abb1cc..379f2289ad 100644
--- a/src/app/core/tasks/pool-task-data.service.ts
+++ b/src/app/core/tasks/pool-task-data.service.ts
@@ -26,25 +26,8 @@ export class PoolTaskDataService extends TasksService<PoolTask> {
* The endpoint link name
*/
protected linkPath = 'pooltasks';
+ protected responseMsToLive = 10 * 1000;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
- protected responseMsToLive = 0;
-
-=======
->>>>>>> Refactored to remove forceBypassCache param from requestService and from data service classes.
-=======
- protected resetMsToLive = true;
-=======
- protected resetMsToLive = 0;
->>>>>>> Sets responseMsToLive to zero in some dataService methods and adds ability to reset the responseMsToLive value in subclasses.
-=======
- protected responseMsToLive = 0;
->>>>>>> Renamed cache property and replaced conditional with hasValue.
-
->>>>>>> Setting cache period to zero for all instances where forceBypassCache was previously true.
/**
* Initialize instance variables
*
--
GitLab