RanchiMall/flosight-api
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

starting to show sync status via socket

Browse Source
This commit is contained in:
Manuel Araoz 2014-01-21 11:51:34 -03:00
parent 99c04752cd
commit ae9dd66b7a
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/socket.js
View File

@ -27,5 +27,6 @@ module.exports.broadcast_address_tx = function(address, tx) {
}; };
module.exports.broadcastSyncInfo = function(syncInfo) { module.exports.broadcastSyncInfo = function(syncInfo) {
ios.sockets.emit('sync', syncInfo); console.log('broadcastSyncInfo');
ios.sockets.in('sync').emit('status', syncInfo);
}; };

10
public/js/controllers/footer.js
View File

@ -1,16 +1,8 @@
'use strict'; 'use strict';
angular.module('insight.system').controller('FooterController', angular.module('insight.system').controller('FooterController',
function ($scope, Global, Status) { function ($scope, Global) {
$scope.global = Global; $scope.global = Global;
$scope.getFooter = function() {
Status.get({
q: 'getInfo'
}, function(d) {
$scope.info = d.info;
});
};
}); });

9
public/js/controllers/status.js
View File

@ -1,7 +1,7 @@
'use strict'; 'use strict';
angular.module('insight.status').controller('StatusController', angular.module('insight.status').controller('StatusController',
function ($scope, $routeParams, $location, $rootScope, Global, Status, Sync) { function ($scope, $routeParams, $location, $rootScope, Global, Status, Sync, get_socket) {
$scope.global = Global; $scope.global = Global;
$scope.getStatus = function(q) { $scope.getStatus = function(q) {
@ -28,5 +28,12 @@ angular.module('insight.status').controller('StatusController',
$rootScope.syncError = 'Could not get sync information' + e; $rootScope.syncError = 'Could not get sync information' + e;
}); });
}; };
var socket = get_socket($scope);
socket.emit('subscribe', 'sync');
socket.on('status', function(info) {
console.log('info '+JSON.stringify(info));
});
}); });

4
public/views/header.html
View File

@ -22,9 +22,9 @@
</div> </div>
<div class="no_matching text-danger" ng-show="badQuery">No matching records found!</div> <div class="no_matching text-danger" ng-show="badQuery">No matching records found!</div>
</form> </form>
<div class="status" data-ng-controller="FooterController" data-ng-init="getFooter()"> <div class="status" data-ng-controller="StatusController" data-ng-init="getStatus('Info')">
<i class="small" data-ng-show="info.blocks"> <i class="small" data-ng-show="info.blocks">
<strong>Status:</strong> On Sync <strong>Status:</strong> {{statusMessage}}
</i> </i>
<i class="small"> <i class="small">
<strong> Connections: </strong> {{info.connections}} <strong> Connections: </strong> {{info.connections}}