style(jshint): some style fixes and jshint compatibility improved

This commit is contained in:
Damian Mee 2014-09-04 01:08:41 +02:00
parent 56315ffd34
commit 6b004fdf8e
4 changed files with 21 additions and 22 deletions

View file

@ -1,8 +1,10 @@
#!/usr/bin/env node #!/usr/bin/env node
'use strict';
var fs = require('fs'); var fs = require('fs');
var createServer = require('../lib/app.js'); var createServer = require('../lib/app.js');
var argv = require('minimist')(process.argv.slice(2)); var argv = require('minimist')(process.argv.slice(2));
var logger = require('../lib/logger');
var options = { var options = {
postgres: process.env.DATABASE_URL postgres: process.env.DATABASE_URL

View file

@ -1,3 +1,5 @@
'use strict';
var bunyan = require('bunyan'); var bunyan = require('bunyan');
var async = require('async'); var async = require('async');
@ -10,25 +12,26 @@ var bunyan = bunyan.createLogger({name: 'lamassu-server', level: logLevel});
// log version // log version
var version = require('../package.json').version; var version = require('../package.json').version;
bunyan.info('Version:', version); bunyan.info('Version: %s', version);
// log twitter stuff (optional) // log git stuff (optional)
function wrapper(fn) { // `git-rev` omits `err` param in callback, without this wrapper
return function(cb) { // `async` interprets returned values as errors.
function wrapper(fn, cb) {
fn(function(value) { fn(function(value) {
cb(null, value); cb(null, value);
}); });
}
} }
try { try {
var git = require('git-rev'); var git = require('git-rev');
async.parallel([ async.parallel([
wrapper(git.branch), async.apply(wrapper, git.branch),
wrapper(git.short) async.apply(wrapper, git.short)
], ],
function(err, values) { function(err, values) {
bunyan.info('Git:', '#' + values[0], '@' + values[1]); bunyan.info('Git: #%s @%s', values[0], values[1]);
}); });
} catch(_) {} } catch(_) {}

View file

@ -17,12 +17,7 @@ var traderPlugin = null;
var walletPlugin = null; var walletPlugin = null;
var idVerifierPlugin = null; var idVerifierPlugin = null;
var currentlyUsedPlugins = { var currentlyUsedPlugins = {};
ticker: null,
transfer: null,
trader: null,
idVerifier: null
};
var cachedConfig = null; var cachedConfig = null;
@ -135,7 +130,7 @@ exports.configure = function configure(config) {
tickerPlugin, tickerPlugin,
'ticker', 'ticker',
deviceCurrency, // device currency deviceCurrency, // device currency
function onTickerChange(newTicker, currency) { function onTickerChange(newTicker) {
tickerPlugin = newTicker; tickerPlugin = newTicker;
pollRate(); pollRate();
} }
@ -335,7 +330,7 @@ function pollBalance(callback) {
} }
function pollRate(callback) { function pollRate(callback) {
logger.debug('polling for rates (' + tickerPlugin.NAME + ')'); logger.debug('polling for rates (%s)', tickerPlugin.NAME);
tickerPlugin.ticker(deviceCurrency, function(err, resRates) { tickerPlugin.ticker(deviceCurrency, function(err, resRates) {
if (err) { if (err) {

View file

@ -6,7 +6,6 @@ var mock = false;
var plugins; var plugins;
var lamassuConfig; var lamassuConfig;
var config;
module.exports = { module.exports = {
init: init, init: init,
@ -58,7 +57,7 @@ function poll(req, res) {
}; };
if (response.idVerificationEnabled) if (response.idVerificationEnabled)
response.idVerificationLimit = complianceSettings.idVerificationLimit response.idVerificationLimit = complianceSettings.idVerificationLimit;
res.json(response); res.json(response);
} }