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

Get timeout from async function

Browse Source
This commit is contained in:
Raul Ochoa 2016-10-21 13:09:17 +02:00
parent 7563868514
commit 26e4cb3196
1 changed files with 33 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
batch/job_runner.js
View File

@ -23,11 +23,13 @@ JobRunner.prototype.run = function (job_id, callback) {
return callback(err); return callback(err);
} }
var query = job.getNextQuery(); self.getQueryStatementTimeout(job.data.user, function(err, timeout) {
var timeout = 12 * 3600 * 1000; if (err) {
if (Number.isFinite(global.settings.batch_query_timeout)) { return callback(err);
timeout = global.settings.batch_query_timeout;
} }
var query = job.getNextQuery();
if (_.isObject(query)) { if (_.isObject(query)) {
if (Number.isFinite(query.timeout) && query.timeout > 0) { if (Number.isFinite(query.timeout) && query.timeout > 0) {
timeout = Math.min(timeout, query.timeout); timeout = Math.min(timeout, query.timeout);
@ -51,6 +53,16 @@ JobRunner.prototype.run = function (job_id, callback) {
self._run(job, query, timeout, profiler, callback); self._run(job, query, timeout, profiler, callback);
}); });
}); });
});
};
JobRunner.prototype.getQueryStatementTimeout = function(username, callback) {
var timeout = 12 * 3600 * 1000;
if (Number.isFinite(global.settings.batch_query_timeout)) {
timeout = global.settings.batch_query_timeout;
}
return callback(null, timeout);
}; };
JobRunner.prototype._run = function (job, query, timeout, profiler, callback) { JobRunner.prototype._run = function (job, query, timeout, profiler, callback) {