From ec62e77c8097644cbf4297476d7db392f28100c3 Mon Sep 17 00:00:00 2001
From: Manuel Araoz <manuelaraoz@gmail.com>
Date: Thu, 13 Feb 2014 12:28:22 -0300
Subject: [PATCH 1/2] fix bitcoind message problem

---
 app/controllers/status.js             | 6 ++++--
 public/src/js/services/status.js      | 2 +-
 public/views/includes/connection.html | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/controllers/status.js b/app/controllers/status.js
index 5a509b5..0d9194b 100644
--- a/app/controllers/status.js
+++ b/app/controllers/status.js
@@ -52,6 +52,8 @@ exports.sync = function(req, res) {
 };
 
 exports.peer = function(req, res) {
-  if (req.peerSync)
-    res.jsonp(req.peerSync.info());
+  if (req.peerSync) {
+    var info = req.peerSync.info();
+    res.jsonp(info);
+  }
 };
diff --git a/public/src/js/services/status.js b/public/src/js/services/status.js
index 307d66d..62fb84e 100644
--- a/public/src/js/services/status.js
+++ b/public/src/js/services/status.js
@@ -13,5 +13,5 @@ angular.module('insight.status')
     })
   .factory('PeerSync',
     function($resource) {
-      return $resource('api/peer');
+      return $resource('/api/peer');
     });
diff --git a/public/views/includes/connection.html b/public/views/includes/connection.html
index fff5f22..3d51aac 100644
--- a/public/views/includes/connection.html
+++ b/public/views/includes/connection.html
@@ -3,7 +3,7 @@
   <!-- apiOnline disabled  || !apiOnline -->
   <div class="alert alert-danger" data-ng-show="!serverOnline || !clienteOnline", data-ng-init="getConnStatus()">
     <strong>Error!</strong>
-    <!-- <p data-ng-show="!apiOnline">Can't connect to bitcoind.</p> -->
+    <p data-ng-show="!apiOnline">Can't connect to bitcoind.</p>
     <p data-ng-show="!serverOnline">Can't connect to server.</p>
     <p data-ng-show="!clienteOnline">Can't connect to internet. Please, check your connection.</p>
   </div>

From add40885429b73c97a3fc1aea89c7e61d123edb9 Mon Sep 17 00:00:00 2001
From: Manuel Araoz <manuelaraoz@gmail.com>
Date: Thu, 13 Feb 2014 12:35:35 -0300
Subject: [PATCH 2/2] add error message

---
 app/controllers/blocks.js             | 11 +++++++----
 public/views/includes/connection.html |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/controllers/blocks.js b/app/controllers/blocks.js
index b67d8f3..5d828dc 100644
--- a/app/controllers/blocks.js
+++ b/app/controllers/blocks.js
@@ -104,21 +104,24 @@ exports.list = function(req, res) {
   bdb.getBlocksByDate(gte, lte, function(err, blocks) {
     if (err) {
       res.status(500).send(err);
-    }
-    else {
+    } else {
       var blockList = [];
       var l = blocks.length;
       var limit = parseInt(req.query.limit || l);
       if (l < limit) limit = l;
 
-      for(var i=0;i<limit;i++) {
+      for (var i = 0; i < limit; i++) {
         blockList.push(blocks[i]);
       }
 
       async.mapSeries(blockList,
         function(b, cb) {
           getBlock(b.hash, function(err, info) {
-            return cb(err,{
+            if (err) {
+              console.log(err);
+              return cb(err);
+            }
+            return cb(err, {
               height: info.height,
               size: info.size,
               hash: b.hash,
diff --git a/public/views/includes/connection.html b/public/views/includes/connection.html
index 3d51aac..86b6313 100644
--- a/public/views/includes/connection.html
+++ b/public/views/includes/connection.html
@@ -1,7 +1,7 @@
 <div class="connection-status container" data-ng-controller="ConnectionController">
 
   <!-- apiOnline disabled  || !apiOnline -->
-  <div class="alert alert-danger" data-ng-show="!serverOnline || !clienteOnline", data-ng-init="getConnStatus()">
+  <div class="alert alert-danger" data-ng-show="!serverOnline || !clienteOnline || !apiOnline", data-ng-init="getConnStatus()">
     <strong>Error!</strong>
     <p data-ng-show="!apiOnline">Can't connect to bitcoind.</p>
     <p data-ng-show="!serverOnline">Can't connect to server.</p>