update error handler to convert props to keys
This commit is contained in:
parent
456c2dc831
commit
f53ca8d958
4 changed files with 20 additions and 9 deletions
|
@ -1,9 +1,20 @@
|
||||||
const logger = require('winston');
|
const logger = require('winston');
|
||||||
const { postToStats } = require('../controllers/statsController.js');
|
const { postToStats } = require('../controllers/statsController.js');
|
||||||
|
|
||||||
|
function useObjectPropertiesIfNoKeys (err) {
|
||||||
|
if (Object.keys(err).length === 0) {
|
||||||
|
let newErrorObject = {};
|
||||||
|
Object.getOwnPropertyNames(err).forEach((key) => {
|
||||||
|
newErrorObject[key] = err[key];
|
||||||
|
});
|
||||||
|
return newErrorObject;
|
||||||
|
}
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
handleRequestError (action, originalUrl, ip, error, res) {
|
handleRequestError (action, originalUrl, ip, error, res) {
|
||||||
logger.error('Request Error:', error.message);
|
logger.error('Request Error:', useObjectPropertiesIfNoKeys(error));
|
||||||
postToStats(action, originalUrl, ip, null, null, error);
|
postToStats(action, originalUrl, ip, null, null, error);
|
||||||
if (error.response) {
|
if (error.response) {
|
||||||
res.status(error.response.status).send(error.response.data.error.message);
|
res.status(error.response.status).send(error.response.data.error.message);
|
||||||
|
@ -16,7 +27,7 @@ module.exports = {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
handlePublishError (error) {
|
handlePublishError (error) {
|
||||||
logger.error('Publish Error:', error.message);
|
logger.error('Publish Error:', useObjectPropertiesIfNoKeys(error));
|
||||||
if (error.code === 'ECONNREFUSED') {
|
if (error.code === 'ECONNREFUSED') {
|
||||||
return 'Connection refused. The daemon may not be running.';
|
return 'Connection refused. The daemon may not be running.';
|
||||||
} else if (error.response.data.error) {
|
} else if (error.response.data.error) {
|
||||||
|
|
|
@ -115,7 +115,7 @@ module.exports = {
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.catch(error => {
|
.catch(error => {
|
||||||
logger.error('Lbrynet Error:', error.message);
|
logger.error('Lbrynet Error:', error);
|
||||||
resolve('/home/lbry/Downloads/');
|
resolve('/home/lbry/Downloads/');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -52,7 +52,7 @@ function getLongClaimIdFromShortClaimId (name, shortId) {
|
||||||
.then(result => {
|
.then(result => {
|
||||||
switch (result.length) {
|
switch (result.length) {
|
||||||
case 0:
|
case 0:
|
||||||
return reject(new Error('That is an invalid Short Claim Id'));
|
throw new Error('That is an invalid Short Claim Id');
|
||||||
default: // note results must be sorted
|
default: // note results must be sorted
|
||||||
return resolve(result[0].claimId);
|
return resolve(result[0].claimId);
|
||||||
}
|
}
|
||||||
|
@ -179,7 +179,7 @@ db['getShortClaimIdFromLongClaimId'] = (claimId, claimName) => {
|
||||||
.then(result => {
|
.then(result => {
|
||||||
switch (result.length) {
|
switch (result.length) {
|
||||||
case 0:
|
case 0:
|
||||||
return reject(new Error('That is an invalid claim name'));
|
throw new Error('That is an invalid claim name');
|
||||||
default:
|
default:
|
||||||
return resolve(sortResult(result, claimId));
|
return resolve(sortResult(result, claimId));
|
||||||
}
|
}
|
||||||
|
@ -198,7 +198,7 @@ db['getShortChannelIdFromLongChannelId'] = (channelName, longChannelId) => {
|
||||||
.then(result => {
|
.then(result => {
|
||||||
switch (result.length) {
|
switch (result.length) {
|
||||||
case 0:
|
case 0:
|
||||||
return reject(new Error('That is an invalid channel name'));
|
throw new Error('That is an invalid channel name');
|
||||||
default:
|
default:
|
||||||
return resolve(sortResult(result, longChannelId));
|
return resolve(sortResult(result, longChannelId));
|
||||||
}
|
}
|
||||||
|
@ -238,7 +238,7 @@ db['resolveClaim'] = (name, claimId) => {
|
||||||
case 1:
|
case 1:
|
||||||
return resolve(result[0]);
|
return resolve(result[0]);
|
||||||
default:
|
default:
|
||||||
return new Error('more than one entry matches that name and claimID');
|
throw new Error('more than one entry matches that name and claimID');
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.catch(error => {
|
.catch(error => {
|
||||||
|
@ -255,7 +255,7 @@ db['getClaimIdByLongChannelId'] = (channelId, claimName) => {
|
||||||
.then(result => {
|
.then(result => {
|
||||||
switch (result.length) {
|
switch (result.length) {
|
||||||
case 0:
|
case 0:
|
||||||
return reject(new Error('There is no such claim for that channel'));
|
throw new Error('There is no such claim for that channel');
|
||||||
default:
|
default:
|
||||||
return resolve(result[0].claimId);
|
return resolve(result[0].claimId);
|
||||||
}
|
}
|
||||||
|
|
|
@ -40,7 +40,7 @@
|
||||||
"socketio-file-upload": "^0.6.0",
|
"socketio-file-upload": "^0.6.0",
|
||||||
"universal-analytics": "^0.4.13",
|
"universal-analytics": "^0.4.13",
|
||||||
"winston": "^2.3.1",
|
"winston": "^2.3.1",
|
||||||
"winston-slack-webhook": "^0.1.5"
|
"winston-slack-webhook": "billbitt/winston-slack-webhook"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"eslint": "3.19.0",
|
"eslint": "3.19.0",
|
||||||
|
|
Loading…
Reference in a new issue