Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove caching from WPS requests #4331

Merged
merged 3 commits into from
Aug 7, 2020
Merged

remove caching from WPS requests #4331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fd161ea
remove caching from WPS requests
rowanwins May 19, 2020
8c630cd
Merge branch 'master' into wps-caching
rowanwins Aug 7, 2020
1a04bff
Add changes.md
rowanwins Aug 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ Change Log

### Next Release

* remove caching from WPS requests.

### v7.11.8

Expand Down
6 changes: 3 additions & 3 deletions lib/Models/WebProcessingServiceCatalogFunction.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ WebProcessingServiceCatalogFunction.prototype._load = function() {
Identifier: this.identifier
});

var url = proxyCatalogItemUrl(this, uri.toString(), "1d");
var url = proxyCatalogItemUrl(this, uri.toString(), "0s");

var that = this;
return loadXML(url).then(function(xml) {
Expand Down Expand Up @@ -574,7 +574,7 @@ WebProcessingServiceCatalogFunction.prototype.invoke = function() {

var that = this;
when.all(createWpsDataInputsFromParameters(this)).then(function(dataInputs) {
var proxyCacheDuration = "1d";
var proxyCacheDuration = "0s";
var promise;
if (that.executeWithHttpGet) {
promise = loadResponseWithKvp(
Expand Down Expand Up @@ -815,7 +815,7 @@ function handleExecuteResponse(
// Continue polling the status location, waiting 500ms between each response and the next request.
return runLater(function() {
return loadXML(
proxyCatalogItemUrl(catalogFunction, json.statusLocation, "1d")
proxyCatalogItemUrl(catalogFunction, json.statusLocation, "0s")
).then(function(xml) {
return handleExecuteResponse(
catalogFunction,
Expand Down
2 changes: 1 addition & 1 deletion lib/Models/WebProcessingServiceCatalogGroup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ WebProcessingServiceCatalogGroup.prototype._load = function() {
version: "1.0.0"
});

var url = proxyCatalogItemUrl(this, uri.toString(), "1d");
var url = proxyCatalogItemUrl(this, uri.toString(), "0s");

var that = this;
return loadXML(url).then(function(xml) {
Expand Down
2 changes: 1 addition & 1 deletion lib/Models/WebProcessingServiceCatalogItem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ WebProcessingServiceCatalogItem.prototype._load = function() {
wpsResponsePromise = when(that.wpsResponse);
} else {
wpsResponsePromise = loadXML(
proxyCatalogItemUrl(that, that.wpsResponseUrl, "1d")
proxyCatalogItemUrl(that, that.wpsResponseUrl, "0s")
);
}

Expand Down