Merge branch 'master' into creating-indexes

.travis.yml

@@ -1,6 +1,6 @@
 before_script:
   - lsb_release -a
-  - sudo mv /etc/apt/sources.list.d/pgdg-source.list* /tmp
+  - sudo mv /etc/apt/sources.list.d/pgdg.list* /tmp
   - sudo apt-get -qq purge postgis* postgresql*
   - sudo rm -Rf /var/lib/postgresql /etc/postgresql
   - sudo apt-add-repository --yes ppa:cartodb/postgresql-9.5

NEWS.md

@@ -1,8 +1,13 @@
-1.34.2 - 2016-mm-dd
+1.34.3 - 2016-mm-dd
+-------------------
+
+
+1.34.2 - 2016-08-30
 -------------------
 
 Announcements:
  * Upgrades cartodb-redis to 0.13.1.
+ * Set TTL of finished job to 2h
 
 
 1.34.1 - 2016-07-11

batch/job_backend.js

@@ -5,7 +5,7 @@ var queue = require('queue-async');
 var debug = require('./util/debug')('job-backend');
 var REDIS_PREFIX = 'batch:jobs:';
 var REDIS_DB = 5;
-var JOBS_TTL_IN_SECONDS = global.settings.jobs_ttl_in_seconds || 48 * 3600; // 48 hours
+var FINISHED_JOBS_TTL_IN_SECONDS = global.settings.finished_jobs_ttl_in_seconds || 2 * 3600; // 2 hours
 var jobStatus = require('./job_status');
 var finalStatus = [
     jobStatus.CANCELLED,
@@ -178,7 +178,7 @@ JobBackend.prototype.setTTL = function (job, callback) {
         return callback();
     }
 
-    self.metadataBackend.redisCmd(REDIS_DB, 'EXPIRE', [ redisKey, JOBS_TTL_IN_SECONDS ], callback);
+    self.metadataBackend.redisCmd(REDIS_DB, 'EXPIRE', [ redisKey, FINISHED_JOBS_TTL_IN_SECONDS ], callback);
 };
 
 JobBackend.prototype.list = function (user, callback) {

config/environments/development.js.example

@@ -29,7 +29,7 @@ module.exports.db_pubuser_pass   = 'public';
 module.exports.db_host      = 'localhost';
 module.exports.db_port      = '5432';
 module.exports.db_batch_port      = '5432';
-module.exports.jobs_ttl_in_seconds = 48 * 3600; // 48 hours
+module.exports.finished_jobs_ttl_in_seconds = 2 * 3600; // 2 hours
 // Max database connections in the pool
 // Subsequent connections will wait for a free slot.
 // NOTE: not used by OGR-mediated accesses

config/environments/production.js.example

@@ -30,7 +30,7 @@ module.exports.db_pubuser_pass   = 'public';
 module.exports.db_host      = 'localhost';
 module.exports.db_port      = '6432';
 module.exports.db_batch_port      = '5432';
-module.exports.jobs_ttl_in_seconds = 48 * 3600; // 48 hours
+module.exports.finished_jobs_ttl_in_seconds = 2 * 3600; // 2 hours
 // Max database connections in the pool
 // Subsequent connections will wait for a free slot.i
 // NOTE: not used by OGR-mediated accesses

config/environments/staging.js.example

@@ -30,7 +30,7 @@ module.exports.db_pubuser_pass   = 'public';
 module.exports.db_host      = 'localhost';
 module.exports.db_port      = '6432';
 module.exports.db_batch_port      = '5432';
-module.exports.jobs_ttl_in_seconds = 48 * 3600; // 48 hours
+module.exports.finished_jobs_ttl_in_seconds = 2 * 3600; // 2 hours
 // Max database connections in the pool
 // Subsequent connections will wait for a free slot.
 // NOTE: not used by OGR-mediated accesses

config/environments/test.js.example

@@ -27,7 +27,7 @@ module.exports.db_pubuser_pass   = 'public';
 module.exports.db_host      = 'localhost';
 module.exports.db_port      = '5432';
 module.exports.db_batch_port      = '5432';
-module.exports.jobs_ttl_in_seconds = 48 * 3600; // 48 hours
+module.exports.finished_jobs_ttl_in_seconds = 2 * 3600; // 2 hours
 // Max database connections in the pool
 // Subsequent connections will wait for a free slot.
 // NOTE: not used by OGR-mediated accesses

package.json

@@ -5,7 +5,7 @@
     "keywords": [
         "cartodb"
     ],
-    "version": "1.34.2",
+    "version": "1.34.3",
     "repository": {
         "type": "git",
         "url": "git://github.com/CartoDB/CartoDB-SQL-API.git"