From 3877f2a950d2e0b096795b2bbf09af64edb387bb Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Mon, 22 Jan 2018 17:46:04 -0800 Subject: [PATCH] Fix parsing of result message in uploadlogs --- src/vs/code/electron-main/logUploader.ts | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/src/vs/code/electron-main/logUploader.ts b/src/vs/code/electron-main/logUploader.ts index f4a034627d327..795321e8600ec 100644 --- a/src/vs/code/electron-main/logUploader.ts +++ b/src/vs/code/electron-main/logUploader.ts @@ -94,12 +94,22 @@ async function postLogs( throw e; } - try { - return JSON.parse(result.stream.toString()); - } catch (e) { - console.log(localize('parseError', 'Error parsing response')); - throw e; - } + return new TPromise((res, reject) => { + const parts: Buffer[] = []; + result.stream.on('data', data => { + parts.push(data); + }); + + result.stream.on('end', () => { + try { + const result = Buffer.concat(parts).toString('utf-8'); + res(JSON.parse(result)); + } catch (e) { + console.log(localize('parseError', 'Error parsing response')); + reject(e); + } + }); + }); } function zipLogs(