From d3a0ae10bd2d359f10e75deabe86421856664536 Mon Sep 17 00:00:00 2001
From: Paulo Rodrigues <me@paulogr.com>
Date: Mon, 29 Jan 2018 15:47:00 -0200
Subject: [PATCH] fix: Return swarm http errors as json

Closes #1176
---
 src/http/api/resources/swarm.js | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/http/api/resources/swarm.js b/src/http/api/resources/swarm.js
index fc92d76002..915a64f974 100644
--- a/src/http/api/resources/swarm.js
+++ b/src/http/api/resources/swarm.js
@@ -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({