From d4f18763a1a69aa12f5c03ccc9e083337df0782b Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Mon, 13 Apr 2015 12:47:23 -0400 Subject: [PATCH] Fixing bug where logs would include headers Signed-off-by: Jeffrey Morgan --- src/LogStore.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/LogStore.js b/src/LogStore.js index a42010131b..fa14b34e11 100644 --- a/src/LogStore.js +++ b/src/LogStore.js @@ -33,8 +33,9 @@ module.exports = assign(Object.create(EventEmitter.prototype), { throw err; } var logs = []; - logStream.setEncoding('utf-8'); - logStream.on('data', (chunk) => { + var outstream = new stream.PassThrough(); + docker.client().modem.demuxStream(logStream, outstream, outstream); + outstream.on('data', (chunk) => { logs.push(_convert.toHtml(this._escape(chunk))); }); logStream.on('end', () => { @@ -57,8 +58,9 @@ module.exports = assign(Object.create(EventEmitter.prototype), { if (err) { throw err; } - logStream.setEncoding('utf-8'); - logStream.on('data', (chunk) => { + var outstream = new stream.PassThrough(); + docker.client().modem.demuxStream(logStream, outstream, outstream); + outstream.on('data', (chunk) => { _logs[name].push(_convert.toHtml(this._escape(chunk))); if (_logs[name].length > MAX_LOG_SIZE) { _logs[name] = _logs[name].slice(_logs[name].length - MAX_LOG_SIZE, MAX_LOG_SIZE);