From: dsc Date: Thu, 1 Mar 2012 01:08:29 +0000 (-0800) Subject: Return the plaintext result of the git pull command to the webhook caller. X-Git-Url: http://git.less.ly:3516/?a=commitdiff_plain;h=6d996e506f5a2eba1b917247b0f9b94b9a25737e;p=kraken-ui.git Return the plaintext result of the git pull command to the webhook caller. --- diff --git a/lib/server/server.co b/lib/server/server.co index 7532b68..c44887d 100755 --- a/lib/server/server.co +++ b/lib/server/server.co @@ -195,12 +195,14 @@ app.all '/webhook/post-update', (req, res) -> # exec the pull async... console.log '[/webhook/post-update] $ git pull origin master' child = exec 'git pull origin master', (err, stdout, stderr) -> + res.contentType '.txt' console.log '[/webhook/post-update] ', stdout console.log '[/webhook/post-update] ', stderr - console.error '[/webhook/post-update] ERROR!', err if err - - # ...but return ok to caller right away - res.send 'ok!', 200 + if err + console.error '[/webhook/post-update] ERROR!', err + res.send "#stdout\n\n#stderr\n\nERROR! #err", 503 + else + res.send "#stdout\n\n#stderr", 200