From 69566f7fc3acbe685ba96d23aa12950f4c3fb2be Mon Sep 17 00:00:00 2001 From: Juan Cruz Viotti Date: Thu, 13 Aug 2015 15:08:16 -0400 Subject: [PATCH] Force logs command to exit when not in --tail mode. Fix #14. PubNub keeps the process alive after a history query for some reason, so trying to print the logs history like: $ resin logs Will result in the logs being printed correctly, but the process waiting infinitely without ending. The workaround consists in forcing `process.exit` to exit the process with an error code zero. Caveats: - This workaround prevents this command to be used programatically. Issue: https://github.com/resin-io/resin-cli/issues/14 --- build/actions/logs.js | 4 +++- lib/actions/logs.coffee | 7 ++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/build/actions/logs.js b/build/actions/logs.js index 33562661..d731e26f 100644 --- a/build/actions/logs.js +++ b/build/actions/logs.js @@ -24,7 +24,9 @@ return console.log(line.message); }); if (!options.tail) { - return promise.nodeify(done); + return promise["catch"](done)["finally"](function() { + return process.exit(0); + }); } return promise.then(function() { return resin.logs.subscribe(params.uuid).then(function(logs) { diff --git a/lib/actions/logs.coffee b/lib/actions/logs.coffee index 72a6451f..218f29fb 100644 --- a/lib/actions/logs.coffee +++ b/lib/actions/logs.coffee @@ -34,7 +34,12 @@ module.exports = console.log(line.message) if not options.tail - return promise.nodeify(done) + + # PubNub keeps the process alive after a history query. + # Until this is fixed, we force the process to exit. + # This of course prevents this command to be used programatically + return promise.catch(done).finally -> + process.exit(0) promise.then -> resin.logs.subscribe(params.uuid).then (logs) ->