From c70ad2d0697c62f913555a91e82a61a36b5dd2e0 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Fri, 22 Aug 2014 09:35:52 -0400 Subject: [PATCH] feature(pawn) error, stderr, stdout -> error, stdout, stderr --- lib/server/console.js | 2 +- lib/server/pawn.js | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/server/console.js b/lib/server/console.js index ddbebda8..6856663f 100644 --- a/lib/server/console.js +++ b/lib/server/console.js @@ -201,7 +201,7 @@ } function setSpawn(сommand, options, callback) { - pawn(сommand, options, function(error, stderr, stdout) { + pawn(сommand, options, function(error, stdout, stderr) { var errorStr = ''; Util.log(error); diff --git a/lib/server/pawn.js b/lib/server/pawn.js index 9d7a9c4e..6a1fa5ef 100644 --- a/lib/server/pawn.js +++ b/lib/server/pawn.js @@ -12,9 +12,9 @@ var cmd, error, isSended = false, args = сommand.split(' '), - func = function(error, stderr, stdout) { + func = function(error, stdout, stderr) { isSended = true; - callback(error, stderr, stdout); + callback(error, stdout, stderr); }; сommand = args.shift(); @@ -30,11 +30,11 @@ cmd.stdout.setEncoding('utf8'); cmd.stdout.on('data', function(data) { - func(null, null, data); + func(null, data); }); cmd.stderr.on('data', function(error) { - func(null, error); + func(null, null, error); }); cmd.on('error', function(error) {