diff --git a/endpoints/ios.js b/endpoints/ios.js index 3bc9ece..dd5654e 100644 --- a/endpoints/ios.js +++ b/endpoints/ios.js @@ -36,12 +36,12 @@ function init(req, res) { // }); var child; - var job = queue.create('exec_command_line', { + var job = queue.create('exec_command_line' + id, { title: 'Command Line for: ' + req.body.servico, command_line: command_line }).removeOnComplete( true ).save(); - queue.process('exec_command_line', function(job, done){ + queue.process('exec_command_line' + id, function(job, done){ child = queue_helper.exec_command_line(job.data.command_line, done); }); diff --git a/endpoints/legenda.js b/endpoints/legenda.js index 5315292..47375d5 100644 --- a/endpoints/legenda.js +++ b/endpoints/legenda.js @@ -50,12 +50,12 @@ function init(req, res) { // // console.log(stdout); // }); - var job = queue.create('exec_command_line', { + var job = queue.create('exec_command_line' + id, { title: 'Command Line for: ' + req.body.servico, command_line: command_line }).save(); - queue.process('exec_command_line', function(job, done){ + queue.process('exec_command_line' + id, function(job, done){ child = queue_helper.exec_command_line(job.data.command_line, done); }); diff --git a/endpoints/texto.js b/endpoints/texto.js index 41bda4d..dca85bd 100644 --- a/endpoints/texto.js +++ b/endpoints/texto.js @@ -54,22 +54,20 @@ function init(req, res, Request) { console.log(command_line); var child; - var job = queue.create('exec_command_line', { + var job = queue.create('exec_command_line' + id, { title: 'Command Line for: ' + req.body.servico, command_line: command_line }).removeOnComplete( true ).save(); - queue.process('exec_command_line', function(job, done){ + queue.process('exec_command_line' + id, function(job, done){ child = queue_helper.exec_command_line(job.data.command_line, done); }); job.on('complete', function() { /* Listener que dispara quando a requisição ao core finaliza */ - // console.log("JOB complete"); child.on('close', function(code, signal) { // res.send(200, { 'response' : 'http://' + properties.SERVER_IP + ':' + properties.port + '/' + id + '.webm' }); - db.update(request_object, 'Completed', function(result) { - }); + db.update(request_object, id, 'Completed', function(result) {}); logger.incrementService("outros", "traducoes"); }); diff --git a/helpers/core.js b/helpers/core.js index ffa9fe8..53d7f03 100644 --- a/helpers/core.js +++ b/helpers/core.js @@ -20,12 +20,12 @@ function call(id, command_line, req, res, Request, request_object) { // }); var child, - job = queue.create('exec_command_line', { + job = queue.create('exec_command_line' + id, { title: 'Command Line for: ' + req.body.servico, command_line: command_line }).removeOnComplete( true ).save(); - queue.process('exec_command_line', function(job, done){ + queue.process('exec_command_line' + id, function(job, done){ child = queue_helper.exec_command_line(job.data.command_line, done); if (child === undefined) { throw "Erro ao conectar com o core"; @@ -41,14 +41,14 @@ function call(id, command_line, req, res, Request, request_object) { // Se o core executou com erro if (code !== 0) { - throw "Erro no retorno do core. Código: " + code; db.update(Request, request_object.id, 'Error', function (result) { }); + throw "Erro no retorno do core. Código: " + code; } // Se o core executou normal db.update(Request, request_object.id, 'Completed', function (result) { - }); + }); res.send(200, { 'response' : 'http://' + properties.SERVER_IP + ':' + properties.port + '/' + id + '.mp4'}); }); diff --git a/helpers/queue.js b/helpers/queue.js index 2106676..e0a075c 100644 --- a/helpers/queue.js +++ b/helpers/queue.js @@ -2,7 +2,8 @@ var exec = require('child_process').exec, child; exports.exec_command_line = function (command_line, done) { - child = exec(command_line, function(err, stdout, stderr) { + // child = exec(command_line, function(err, stdout, stderr) { + child = exec("curl -O http://www.sample-videos.com/video/mp4/720/big_buck_bunny_720p_20mb.mp4", function(err, stdout, stderr) { // console.log('Err: ' + err); // console.log('STDOUT: ' + stdout); // console.log('STDERR: ' + stderr); @@ -20,6 +21,7 @@ exports.exec_command_line = function (command_line, done) { // tentar com isso descomentado no lugar de chamar o done() direto // child.on('close', function(code, signal) { + // console.log("close com done"); // done(); // }); done(); diff --git a/logsystem/services.log b/logsystem/services.log index afce66b..f9b4f0d 100644 --- a/logsystem/services.log +++ b/logsystem/services.log @@ -6,8 +6,8 @@ "saude": 0 }, "outros": { - "requisicoes": 184, - "traducoes": 153, + "requisicoes": 200, + "traducoes": 176, "saude": 0 } } -- libgit2 0.21.2