Skip to content

Commit

Permalink
Merge pull request rsksmart#2 from M-Picco/json-parse-error-message
Browse files Browse the repository at this point in the history
Add parameter to specify a custom error message for tryParseJSON
  • Loading branch information
emiliorizzo authored Jan 13, 2020
2 parents d37f3b7 + c7a8d9b commit fff0642
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions lib/history.js
Original file line number Diff line number Diff line change
Expand Up @@ -674,7 +674,7 @@ History.prototype.getHashrateComparedToBtcNetwork = function()
return percentage < 1 ? 0 : percentage;
}

function tryParseJSON (jsonString){
function tryParseJSON (jsonString, customErrorMessage){
try {
const result = JSON.parse(jsonString);

Expand All @@ -683,7 +683,7 @@ function tryParseJSON (jsonString){
return result;
}
} catch (e) {
console.error("Unable to parse JSON");
console.error(customErrorMessage || "Unable to parse JSON");
}

return false;
Expand All @@ -699,7 +699,7 @@ History.prototype.updateBtcHashrateFromExternalSource = function(source)
});

resp.on('end', () => {
const parsedData = tryParseJSON(data);
const parsedData = tryParseJSON(data, "Failed to update BTC hashrate. Unable to parse JSON response");
if (!parsedData || !parsedData.hasOwnProperty("hash_rate")){
return;
}
Expand Down Expand Up @@ -729,7 +729,7 @@ History.prototype.updateBtcHashrateFromBackUpExternalSource = function(source)
});

resp.on('end', () => {
const parsedData = tryParseJSON(data);
const parsedData = tryParseJSON(data, "Failed to update BTC hashrate. Unable to parse JSON response");
if (!parsedData || !parsedData.hasOwnProperty("status") || parsedData.status !== 'success'){
return;
}
Expand Down

0 comments on commit fff0642

Please sign in to comment.