From a6fbc1477de18a8bc6a726c17a55fe6b75fb480b Mon Sep 17 00:00:00 2001 From: himetani_cafe Date: Thu, 4 Feb 2016 07:07:44 +0900 Subject: [PATCH] [Manual test] /api/v1/execution eos.toExecString() --- server/api/v1/execution/index.js | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/server/api/v1/execution/index.js b/server/api/v1/execution/index.js index b49e712..a425741 100644 --- a/server/api/v1/execution/index.js +++ b/server/api/v1/execution/index.js @@ -23,21 +23,25 @@ router.post('/', function(req, res) { var workspace = data.workspace; eos.validate(command,options, workspace) - .then(function(r) { + .catch(function(r) { var info = { - status: 'success', + status: 'error', + message: r.message }; - console.log('validate success!'); + console.log(r.message); res.send(info); }) - .catch(function(r) { + .then(function() { + return eos.toExecString(command, options, workspace); + }) + .then(function(execStr) { + console.log(execStr); var info = { - status: 'error', - message: r.message + status: 'success', }; - console.log(r.message); res.send(info); - }); + }) + }); }); -- 2.11.0