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

Improved job cancelation and fixed minor bugs

Browse Source
This commit is contained in:
Daniel García Aubert 2015-12-31 17:01:06 +01:00
parent 35650985db
commit 534da04270
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
batch/batch.js
View File

@ -70,9 +70,9 @@ Batch.prototype._consume = function consume(host, queue, callback) {
callback(); callback();
}) })
.on('error', function (err) { .on('error', function (err) {
console.error('Error in job %s due to', job_id, err.message || err); console.error('Error in job %s due to:', job_id, err.message || err);
self.emit('job:failed', job_id); self.emit('job:failed', job_id);
callback(err); callback();
}); });
}); });
}; };

7
batch/job_canceller.js
View File

@ -28,7 +28,7 @@ JobCanceller.prototype.cancel = function (job_id) {
} }
if (job.status !== 'running') { if (job.status !== 'running') {
return jobBackend.emit('error', new Error('Job has been dispatched previously, nothing to do')); return jobBackend.emit('error', new Error('Job is ' + job.status + ' nothing to do'));
} }
self.userDatabaseMetadataService.getUserMetadata(job.user, function (err, userDatabaseMetadata) { self.userDatabaseMetadataService.getUserMetadata(job.user, function (err, userDatabaseMetadata) {
@ -47,12 +47,11 @@ JobCanceller.prototype.cancel = function (job_id) {
return jobBackend.emit('error', err); return jobBackend.emit('error', err);
} }
var pid = result.rows[0].pid; if (!result.rows[0] || result.rows[0].pid) {
if (!pid) {
return jobBackend.emit('error', new Error('Query not running currently')); return jobBackend.emit('error', new Error('Query not running currently'));
} }
var pid = result.rows[0].pid;
var cancelQuery = 'SELECT pg_cancel_backend(' + pid +')'; var cancelQuery = 'SELECT pg_cancel_backend(' + pid +')';
pg.query(cancelQuery, function (err, result) { pg.query(cancelQuery, function (err, result) {