Comparing version 1.3.0-170 to 1.3.0-171
@@ -154,3 +154,3 @@ var models = require('../../common/models.js')(); | ||
dataSources = _.filter(dataSources, function(ds){ | ||
return !ds.cache[0] || !ds.cache[0].lastRefreshed || new Date((new Date(ds.cache[0].lastRefreshed).valueOf() + ds.refreshInterval)) <= currentTime; | ||
return !ds.cache[0] || !ds.cache[0].lastRefreshed || new Date((new Date(ds.cache[0].lastRefreshed).valueOf() + ds.refreshInterval * 60 * 1000)) <= currentTime; | ||
}); | ||
@@ -157,0 +157,0 @@ } |
@@ -230,12 +230,12 @@ var models = require('../../common/models.js')(); | ||
//If the hashes are different, need to update the data set and hash | ||
if(dataSourceData.dataHash !== cacheElement.dataHash){ | ||
if(dataSourceData.dataError || dataSourceData.error){ | ||
cacheElement.currentStatus = { | ||
status: "error", | ||
error: dataSourceData.dataError || dataSourceData.error | ||
}; | ||
} else if(dataSourceData.dataHash !== cacheElement.dataHash){ | ||
//If the hashes are different, need to update the data set and hash | ||
cacheElement.data = dataToUpdate; | ||
cacheElement.dataHash = dataSourceData.dataHash; | ||
dataSourceData.dataChanged = true; | ||
} else if(dataSourceData.dataError || dataSourceData.error){ | ||
cacheElement.currentStatus = { | ||
status: "error", | ||
error: dataSourceData.dataError || dataSourceData.error | ||
} | ||
} | ||
@@ -269,2 +269,9 @@ | ||
cacheElement.lastRefreshed = params.currentTime; | ||
//marking the status as ok. | ||
cacheElement.currentStatus = { | ||
status: "ok", | ||
error: null | ||
}; | ||
cacheElement.markModified('currentStatus'); | ||
} | ||
@@ -271,0 +278,0 @@ |
{ | ||
"name": "fh-forms", | ||
"version": "1.3.0-170", | ||
"version": "1.3.0-171", | ||
"dependencies": { | ||
@@ -5,0 +5,0 @@ "archiver": { |
{ | ||
"name": "fh-forms", | ||
"version": "1.3.0-170", | ||
"version": "1.3.0-171", | ||
"description": "Cloud Forms API for form submission", | ||
@@ -5,0 +5,0 @@ "main": "fhforms.js", |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
560520
13207