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 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