From 074f140ca747a2b2deb3dc4a1bc64ca051f4e242 Mon Sep 17 00:00:00 2001 From: Emily Stark Date: Tue, 25 Mar 2014 10:08:11 -0700 Subject: [PATCH] Fix some error handling and add XXX to do it better --- tools/package-client.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tools/package-client.js b/tools/package-client.js index 9f1446b5bd..6976416338 100644 --- a/tools/package-client.js +++ b/tools/package-client.js @@ -63,13 +63,17 @@ exports.loadCachedServerData = function () { console.log("No cached server data found on disk."); return noDataToken; } + // XXX we should probably return an error to the caller here to + // figure out how to handle it console.log(e.message); - exit(1); + process.exit(1); } - var ret = JSON.parse(data); - if (!ret) { + var ret = noDataToken; + try { + ret = JSON.parse(data); + } catch (err) { + // XXX error handling console.log("Could not parse JSON in data.json."); - return noDataToken; } return ret; };