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

Now profiler is passed as argument instead to be a member property of job runner

Browse Source
This commit is contained in:
Daniel García Aubert 2016-06-22 16:10:42 +02:00
parent 31f9065137
commit e387458801
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
batch/job_runner.js
View File

@ -14,8 +14,8 @@ function JobRunner(jobService, jobQueue, queryRunner, statsdClient) {
JobRunner.prototype.run = function (job_id, callback) { JobRunner.prototype.run = function (job_id, callback) {
var self = this; var self = this;
self.profiler = new Profiler({ statsd_client: self.statsdClient }); var profiler = new Profiler({ statsd_client: self.statsdClient });
self.profiler.start('sqlapi.batch.job'); profiler.start('sqlapi.batch.job');
self.jobService.get(job_id, function (err, job) { self.jobService.get(job_id, function (err, job) {
if (err) { if (err) {
@ -35,14 +35,14 @@ JobRunner.prototype.run = function (job_id, callback) {
return callback(err); return callback(err);
} }
self.profiler.done('running'); profiler.done('running');
self._run(job, query, callback); self._run(job, query, profiler, callback);
}); });
}); });
}; };
JobRunner.prototype._run = function (job, query, callback) { JobRunner.prototype._run = function (job, query, profiler, callback) {
var self = this; var self = this;
self.queryRunner.run(job.data.job_id, query, job.data.user, function (err /*, result */) { self.queryRunner.run(job.data.job_id, query, job.data.user, function (err /*, result */) {
@ -59,10 +59,10 @@ JobRunner.prototype._run = function (job, query, callback) {
try { try {
if (err) { if (err) {
self.profiler.done('failed'); profiler.done('failed');
job.setStatus(jobStatus.FAILED, err.message); job.setStatus(jobStatus.FAILED, err.message);
} else { } else {
self.profiler.done('success'); profiler.done('success');
job.setStatus(jobStatus.DONE); job.setStatus(jobStatus.DONE);
} }
} catch (err) { } catch (err) {
@ -74,9 +74,9 @@ JobRunner.prototype._run = function (job, query, callback) {
return callback(err); return callback(err);
} }
self.profiler.done('done'); profiler.done('done');
self.profiler.end(); profiler.end();
self.profiler.sendStats(); profiler.sendStats();
if (!job.hasNextQuery()) { if (!job.hasNextQuery()) {
return callback(null, job); return callback(null, job);