Commit 007a231e authored by priit's avatar priit

Arhiivi lahtipakkija vigase väljundi parandus

parent 0ec6c687
......@@ -13,6 +13,9 @@ function LocalCommand( commandModel ) {
this.command = "";
this.commandParams = [];
this.generate = function () {
self._parseParams();
var paramsArray = commandParts.slice(commandParts);
......
......@@ -32,6 +32,9 @@ function LocalExecutor() {
var process = spawn(command, commandParams);
logger.debug('Created process: ', process);
async.waterfall([
function (callback) {
session.pid = process.pid;
......
var logger = require('log4js').getLogger('wrapper_archive_extractor');
var fs = require('fs');
var unzip = require('unzip');
var mkdirp = require('mkdirp');
......@@ -5,7 +7,6 @@ var path = require('path');
var SessionService = require('./../src/service/sessionService');
var Session = require('../src/model/session');
var randomstring = require('randomstring');
var logger = require('log4js').getLogger('wrapper');
var mime = require('mime');
var isZip = require('is-zip');
var isGzip = require('is-gzip');
......
var logger = require('log4js').getLogger('wrapper');
var logger = require('log4js').getLogger('wrapper_input_output');
var config = require('./../config');
var localExecutor = require('./../src/service/executor/localExecutor');
var Session = require('../src/model/session');
......@@ -16,11 +16,16 @@ function InputOutputLocalCommand(){
self._getCommandModel(session, function (err, model) {
logger.debug('getCommandModel callback');
if(err) return callback(err);
if(err){
logger.error(err);
return callback(err);
}
localExecutor.execute( model, session, function ( err, response ) {
if(err){
return callback(err);
}
if(err) return callback(err);
logger.debug('Program is finished');
if(response.isSuccess){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment