From 67bf97c1fcd4cbe7e7204b660a0635e878435735 Mon Sep 17 00:00:00 2001
From: Damian Mee <damian.wasilewski@gmail.com>
Date: Fri, 22 Aug 2014 23:44:36 +0200
Subject: [PATCH] config renamed to avoid ambiguousness

---
 lib/app.js     | 14 +++++++-------
 lib/plugins.js |  3 +++
 lib/routes.js  |  5 +++--
 test/index.js  |  1 -
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/lib/app.js b/lib/app.js
index 30c41f2f..d70f9b68 100644
--- a/lib/app.js
+++ b/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
diff --git a/lib/plugins.js b/lib/plugins.js
index cb53b4ae..6352e0c1 100644
--- a/lib/plugins.js
+++ b/lib/plugins.js
@@ -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
diff --git a/lib/routes.js b/lib/routes.js
index 1eafab92..7e9c3aec 100644
--- a/lib/routes.js
+++ b/lib/routes.js
@@ -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;
 
diff --git a/test/index.js b/test/index.js
index 840e92b3..b3a92617 100644
--- a/test/index.js
+++ b/test/index.js
@@ -131,6 +131,5 @@ describe('Plugins', function() {
 
   });
 
-
 });