Skip to content
This repository was archived by the owner on Feb 12, 2024. It is now read-only.

fix: Return swarm http errors as json #1196

Merged
merged 2 commits into from
Feb 15, 2018
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions src/http/api/resources/swarm.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,22 @@ exports = module.exports
// common pre request handler that parses the args and returns `addr` which is assigned to `request.pre.args`
exports.parseAddrs = (request, reply) => {
if (!request.query.arg) {
return reply("Argument 'addr' is required").code(400).takeover()
const err = 'Argument `addr` is required'
log.error(err)
return reply({
Code: 0,
Message: err
}).code(400).takeover()
}

try {
multiaddr(request.query.arg)
} catch (err) {
return reply("Argument 'addr' is invalid").code(500).takeover()
log.error(err)
return reply({
Code: 0,
Message: err.message
}).code(500).takeover()
}

return reply({
Expand Down