cartodb/CartoDB-SQL-API
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #601 from CartoDB/max-age-directive

Browse Source 
Set defaults to avoid error when confing is not provided
This commit is contained in:
Daniel G. Aubert 2019-07-09 10:56:26 +02:00 committed by GitHub
commit a9a24b91ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/query_controller.js
View File

@ -25,6 +25,10 @@ const logMiddleware = require('../middlewares/log');
const ONE_YEAR_IN_SECONDS = 31536000; // ttl in cache provider const ONE_YEAR_IN_SECONDS = 31536000; // ttl in cache provider
const FIVE_MINUTES_IN_SECONDS = 60 * 5; // ttl in cache provider const FIVE_MINUTES_IN_SECONDS = 60 * 5; // ttl in cache provider
const cacheControl = Object.assign({
ttl: ONE_YEAR_IN_SECONDS,
fallbackTtl: FIVE_MINUTES_IN_SECONDS
}, global.settings.cache);
function QueryController(metadataBackend, userDatabaseService, tableCache, statsd_client, userLimitsService) { function QueryController(metadataBackend, userDatabaseService, tableCache, statsd_client, userLimitsService) {
this.metadataBackend = metadataBackend; this.metadataBackend = metadataBackend;
@ -192,10 +196,10 @@ QueryController.prototype.handleQuery = function (req, res, next) {
res.header('Cache-Control', 'public,max-age=' + ONE_YEAR_IN_SECONDS); res.header('Cache-Control', 'public,max-age=' + ONE_YEAR_IN_SECONDS);
} else { } else {
if (affectedTables && affectedTables.getTables().every(table => table.updated_at !== null)) { if (affectedTables && affectedTables.getTables().every(table => table.updated_at !== null)) {
const maxAge = mayWrite ? 0 : (global.settings.cache.ttl || ONE_YEAR_IN_SECONDS); const maxAge = mayWrite ? 0 : cacheControl.ttl;
res.header('Cache-Control', `no-cache,max-age=${maxAge},must-revalidate,public`); res.header('Cache-Control', `no-cache,max-age=${maxAge},must-revalidate,public`);
} else { } else {
const maxAge = global.settings.cache.fallbackTtl || FIVE_MINUTES_IN_SECONDS; const maxAge = cacheControl.fallbackTtl;
res.header('Cache-Control', `no-cache,max-age=${maxAge},must-revalidate,public`); res.header('Cache-Control', `no-cache,max-age=${maxAge},must-revalidate,public`);
} }
} }