lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #60 from naconner/patch-4

Browse source 
2.2.11, add balance and ticker rate logging, snapcard
This commit is contained in:
Josh Harvey 2016-03-18 11:30:34 +02:00
commit 454306dca0
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/plugins.js
View file

@ -409,7 +409,8 @@ function stopTrader() {
} }
function pollBalance(cb) { function pollBalance(cb) {
logger.debug('collecting balance');
var jobs = { var jobs = {
transferBalance: walletPlugin.balance transferBalance: walletPlugin.balance
}; };
@ -426,6 +427,7 @@ function pollBalance(cb) {
return cb && cb(err); return cb && cb(err);
} }
logger.debug('Balance update:', balance);
balance.timestamp = Date.now(); balance.timestamp = Date.now();
lastBalances = balance; lastBalances = balance;
@ -434,12 +436,15 @@ function pollBalance(cb) {
} }
function pollRate(cb) { function pollRate(cb) {
logger.debug('polling for rates (%s)', tickerPlugin.NAME);
tickerPlugin.ticker(deviceCurrency, function(err, resRates) { tickerPlugin.ticker(deviceCurrency, function(err, resRates) {
if (err) { if (err) {
logger.error(err); logger.error(err);
return cb && cb(err); return cb && cb(err);
} }
logger.debug('got rates: %j', resRates);
resRates.timestamp = new Date(); resRates.timestamp = new Date();
lastRates = resRates; lastRates = resRates;

6
package.json
View file

@ -2,7 +2,7 @@
"name": "lamassu-server", "name": "lamassu-server",
"description": "bitcoin atm client server protocol module", "description": "bitcoin atm client server protocol module",
"keywords": [], "keywords": [],
"version": "2.2.10", "version": "2.2.11",
"license": "unlicense", "license": "unlicense",
"author": "Lamassu (https://lamassu.is)", "author": "Lamassu (https://lamassu.is)",
"engines": { "engines": {
@ -27,6 +27,7 @@
"lamassu-coinapult": "^0.4.5", "lamassu-coinapult": "^0.4.5",
"lamassu-coinfloor": "^0.1.2", "lamassu-coinfloor": "^0.1.2",
"lamassu-bitgo": "^0.1.3", "lamassu-bitgo": "^0.1.3",
"lamassu-snapcard": "^0.1.7",
"lodash": "^2.4.1", "lodash": "^2.4.1",
"minimist": "0.0.8", "minimist": "0.0.8",
"node-uuid": "^1.4.2", "node-uuid": "^1.4.2",
@ -39,7 +40,8 @@
}, },
"bin": { "bin": {
"lamassu-server": "./bin/lamassu-server", "lamassu-server": "./bin/lamassu-server",
"ssu-raqia": "./bin/ssu-raqia" "ssu-raqia": "./bin/ssu-raqia",
"ssu": "./bin/ssu"
}, },
"scripts": { "scripts": {
"test": "mocha --recursive test" "test": "mocha --recursive test"