config renamed to avoid ambiguousness
This commit is contained in:
parent
84604689a9
commit
67bf97c1fc
4 changed files with 13 additions and 10 deletions
14
lib/app.js
14
lib/app.js
|
|
@ -13,18 +13,18 @@ module.exports = function (options) {
|
|||
var app = express();
|
||||
var connectionString;
|
||||
var server;
|
||||
var config;
|
||||
var lamassuConfig;
|
||||
var db;
|
||||
|
||||
connectionString = options.postgres ||
|
||||
'postgres://lamassu:lamassu@localhost/lamassu';
|
||||
|
||||
config = new LamassuConfig(connectionString);
|
||||
lamassuConfig = new LamassuConfig(connectionString);
|
||||
db = new PostgresqlInterface(connectionString);
|
||||
plugins.init(db);
|
||||
|
||||
|
||||
config.load(function (err, config) {
|
||||
lamassuConfig.load(function (err, config) {
|
||||
if (err) {
|
||||
logger.error('Loading config failed');
|
||||
throw err;
|
||||
|
|
@ -34,8 +34,8 @@ module.exports = function (options) {
|
|||
plugins.startPolling();
|
||||
});
|
||||
|
||||
config.on('configUpdate', function () {
|
||||
config.load(function (err, config) {
|
||||
lamassuConfig.on('configUpdate', function () {
|
||||
lamassuConfig.load(function (err, config) {
|
||||
if (err) {
|
||||
return logger.error('Error while reloading config');
|
||||
}
|
||||
|
|
@ -62,7 +62,7 @@ module.exports = function (options) {
|
|||
server = https.createServer(serverOptions, app);
|
||||
|
||||
authMiddleware = function(req, res, next) {
|
||||
config.isAuthorized(routes.getFingerprint(req), function (err, device) {
|
||||
lamassuConfig.isAuthorized(routes.getFingerprint(req), function (err, device) {
|
||||
if (err) {
|
||||
res.json({err: 'Internal Server Error'});
|
||||
return next(err);
|
||||
|
|
@ -88,7 +88,7 @@ module.exports = function (options) {
|
|||
|
||||
routes.init({
|
||||
app: app,
|
||||
lamassuConfig: config,
|
||||
lamassuConfig: lamassuConfig,
|
||||
plugins: plugins,
|
||||
authMiddleware: authMiddleware,
|
||||
mock: options.mock
|
||||
|
|
|
|||
|
|
@ -144,6 +144,9 @@ exports.configure = function configure(config) {
|
|||
pollBalance();
|
||||
pollRate();
|
||||
};
|
||||
exports.getCachedConfig = function getCachedConfig() {
|
||||
return cachedConfig;
|
||||
};
|
||||
|
||||
|
||||
// This is where we record starting trade balance at the beginning
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ var logger = require('./logger');
|
|||
var mock = false;
|
||||
|
||||
var plugins;
|
||||
var lamassuConfig;
|
||||
var config;
|
||||
|
||||
module.exports = {
|
||||
|
|
@ -112,7 +113,7 @@ function pair(req, res) {
|
|||
var token = req.body.token;
|
||||
var name = req.body.name;
|
||||
|
||||
config.pair(
|
||||
lamassuConfig.pair(
|
||||
token,
|
||||
getFingerprint(req),
|
||||
name,
|
||||
|
|
@ -127,7 +128,7 @@ function pair(req, res) {
|
|||
}
|
||||
|
||||
function init(localConfig) {
|
||||
config = localConfig.lamassuConfig;
|
||||
lamassuConfig = localConfig.lamassuConfig;
|
||||
plugins = localConfig.plugins;
|
||||
mock = localConfig.mock;
|
||||
|
||||
|
|
|
|||
|
|
@ -131,6 +131,5 @@ describe('Plugins', function() {
|
|||
|
||||
});
|
||||
|
||||
|
||||
});
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue