From db4f1a8acbf4014fe2f0f28f3f4a8d5a70fc69e6 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 11 Apr 2016 17:36:14 -0700 Subject: [PATCH] split gunzip and untar errors --- server-console/src/main.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/server-console/src/main.js b/server-console/src/main.js index 29e874f453..20802fac81 100644 --- a/server-console/src/main.js +++ b/server-console/src/main.js @@ -571,7 +571,7 @@ function maybeInstallDefaultContentSet(onComplete) { } }); - req.pipe(zlib.createGunzip()).pipe(tar.extract(getRootHifiDataDirectory())).on('error', function(){ + function extractError(err) { console.log("Aborting request because gunzip/untar failed"); aborted = true; req.abort(); @@ -580,7 +580,12 @@ function maybeInstallDefaultContentSet(onComplete) { sendStateUpdate('error', { message: "Error installing resources." }); - }).on('finish', function(){ + } + + var gunzip = zlib.createGunzip(); + gunzip.on('error', extractError); + + req.pipe(gunzip).pipe(tar.extract(getRootHifiDataDirectory())).on('error', extractError).on('finish', function(){ // response and decompression complete, return console.log("Done", arguments); sendStateUpdate('complete');