From 4388a248b9e5ddadf0ef9806b49e7cd026055241 Mon Sep 17 00:00:00 2001 From: Tim Perry Date: Thu, 12 Jul 2018 15:23:33 +0200 Subject: [PATCH] Make sure we don't duplicate historical logs when streaming --- lib/actions/logs.coffee | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/actions/logs.coffee b/lib/actions/logs.coffee index c2bcd6df..a4192125 100644 --- a/lib/actions/logs.coffee +++ b/lib/actions/logs.coffee @@ -50,11 +50,11 @@ module.exports = timestamp = moment(line.timestamp).format('DD.MM.YY HH:mm:ss (ZZ)') console.log("#{timestamp} #{line.message}") - promise = resin.logs.history(params.uuid).each(printLine) + promise = if options.tail + resin.logs.subscribe(params.uuid).then (logs) -> + logs.on('line', printLine) + logs.on('error', done) + else + resin.logs.history(params.uuid).each(printLine) - promise.then -> - if options.tail - resin.logs.subscribe(params.uuid).then (logs) -> - logs.on('line', printLine) - logs.on('error', done) - .catch(done) + promise.catch(done)