Merge pull request #290 from maraoz/bug/fix-bitcoind-message
Bug/fix bitcoind message
This commit is contained in:
commit
b320c6f60d
|
@ -104,21 +104,24 @@ exports.list = function(req, res) {
|
||||||
bdb.getBlocksByDate(gte, lte, function(err, blocks) {
|
bdb.getBlocksByDate(gte, lte, function(err, blocks) {
|
||||||
if (err) {
|
if (err) {
|
||||||
res.status(500).send(err);
|
res.status(500).send(err);
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
var blockList = [];
|
var blockList = [];
|
||||||
var l = blocks.length;
|
var l = blocks.length;
|
||||||
var limit = parseInt(req.query.limit || l);
|
var limit = parseInt(req.query.limit || l);
|
||||||
if (l < limit) 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]);
|
blockList.push(blocks[i]);
|
||||||
}
|
}
|
||||||
|
|
||||||
async.mapSeries(blockList,
|
async.mapSeries(blockList,
|
||||||
function(b, cb) {
|
function(b, cb) {
|
||||||
getBlock(b.hash, function(err, info) {
|
getBlock(b.hash, function(err, info) {
|
||||||
return cb(err,{
|
if (err) {
|
||||||
|
console.log(err);
|
||||||
|
return cb(err);
|
||||||
|
}
|
||||||
|
return cb(err, {
|
||||||
height: info.height,
|
height: info.height,
|
||||||
size: info.size,
|
size: info.size,
|
||||||
hash: b.hash,
|
hash: b.hash,
|
||||||
|
|
|
@ -52,6 +52,8 @@ exports.sync = function(req, res) {
|
||||||
};
|
};
|
||||||
|
|
||||||
exports.peer = function(req, res) {
|
exports.peer = function(req, res) {
|
||||||
if (req.peerSync)
|
if (req.peerSync) {
|
||||||
res.jsonp(req.peerSync.info());
|
var info = req.peerSync.info();
|
||||||
|
res.jsonp(info);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
|
@ -13,5 +13,5 @@ angular.module('insight.status')
|
||||||
})
|
})
|
||||||
.factory('PeerSync',
|
.factory('PeerSync',
|
||||||
function($resource) {
|
function($resource) {
|
||||||
return $resource('api/peer');
|
return $resource('/api/peer');
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
<div class="connection-status container" data-ng-controller="ConnectionController">
|
<div class="connection-status container" data-ng-controller="ConnectionController">
|
||||||
|
|
||||||
<!-- apiOnline disabled || !apiOnline -->
|
<!-- 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>
|
<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="!serverOnline">Can't connect to server.</p>
|
||||||
<p data-ng-show="!clienteOnline">Can't connect to internet. Please, check your connection.</p>
|
<p data-ng-show="!clienteOnline">Can't connect to internet. Please, check your connection.</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in New Issue