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

config renamed to avoid ambiguousness

Browse source
This commit is contained in:
Damian Mee 2014-08-22 23:44:36 +02:00
parent 84604689a9
commit 67bf97c1fc
4 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/app.js
View file

@ -13,18 +13,18 @@ module.exports = function (options) {
var app = express(); var app = express();
var connectionString; var connectionString;
var server; var server;
var config; var lamassuConfig;
var db; var db;
connectionString = options.postgres || connectionString = options.postgres ||
'postgres://lamassu:lamassu@localhost/lamassu'; 'postgres://lamassu:lamassu@localhost/lamassu';
config = new LamassuConfig(connectionString); lamassuConfig = new LamassuConfig(connectionString);
db = new PostgresqlInterface(connectionString); db = new PostgresqlInterface(connectionString);
plugins.init(db); plugins.init(db);
config.load(function (err, config) { lamassuConfig.load(function (err, config) {
if (err) { if (err) {
logger.error('Loading config failed'); logger.error('Loading config failed');
throw err; throw err;
@ -34,8 +34,8 @@ module.exports = function (options) {
plugins.startPolling(); plugins.startPolling();
}); });
config.on('configUpdate', function () { lamassuConfig.on('configUpdate', function () {
config.load(function (err, config) { lamassuConfig.load(function (err, config) {
if (err) { if (err) {
return logger.error('Error while reloading config'); return logger.error('Error while reloading config');
} }
@ -62,7 +62,7 @@ module.exports = function (options) {
server = https.createServer(serverOptions, app); server = https.createServer(serverOptions, app);
authMiddleware = function(req, res, next) { authMiddleware = function(req, res, next) {
config.isAuthorized(routes.getFingerprint(req), function (err, device) { lamassuConfig.isAuthorized(routes.getFingerprint(req), function (err, device) {
if (err) { if (err) {
res.json({err: 'Internal Server Error'}); res.json({err: 'Internal Server Error'});
return next(err); return next(err);
@ -88,7 +88,7 @@ module.exports = function (options) {
routes.init({ routes.init({
app: app, app: app,
lamassuConfig: config, lamassuConfig: lamassuConfig,
plugins: plugins, plugins: plugins,
authMiddleware: authMiddleware, authMiddleware: authMiddleware,
mock: options.mock mock: options.mock

3
lib/plugins.js
View file

@ -144,6 +144,9 @@ exports.configure = function configure(config) {
pollBalance(); pollBalance();
pollRate(); pollRate();
}; };
exports.getCachedConfig = function getCachedConfig() {
return cachedConfig;
};
// This is where we record starting trade balance at the beginning // This is where we record starting trade balance at the beginning

5
lib/routes.js
View file

@ -5,6 +5,7 @@ var logger = require('./logger');
var mock = false; var mock = false;
var plugins; var plugins;
var lamassuConfig;
var config; var config;
module.exports = { module.exports = {
@ -112,7 +113,7 @@ function pair(req, res) {
var token = req.body.token; var token = req.body.token;
var name = req.body.name; var name = req.body.name;
config.pair( lamassuConfig.pair(
token, token,
getFingerprint(req), getFingerprint(req),
name, name,
@ -127,7 +128,7 @@ function pair(req, res) {
} }
function init(localConfig) { function init(localConfig) {
config = localConfig.lamassuConfig; lamassuConfig = localConfig.lamassuConfig;
plugins = localConfig.plugins; plugins = localConfig.plugins;
mock = localConfig.mock; mock = localConfig.mock;

1
test/index.js
View file

@ -131,6 +131,5 @@ describe('Plugins', function() {
}); });
}); });