From adc1a4f35389ad417734583813122c388c488c4e Mon Sep 17 00:00:00 2001
From: Josh Harvey <josh@lamassu.is>
Date: Tue, 10 May 2016 02:03:38 +0300
Subject: [PATCH] remove config loading on poll

---
 bin/lamassu-server | 30 +++++++++++++++---------------
 lib/app.js         | 13 +------------
 lib/plugins.js     |  1 +
 lib/routes.js      |  3 +--
 todo.txt           |  5 ++++-
 5 files changed, 22 insertions(+), 30 deletions(-)

diff --git a/bin/lamassu-server b/bin/lamassu-server
index ed485d47..2786709e 100755
--- a/bin/lamassu-server
+++ b/bin/lamassu-server
@@ -1,34 +1,34 @@
 #!/usr/bin/env node
 
-'use strict';
+'use strict'
 
-var fs = require('fs');
-var createServer = require('../lib/app.js');
-var argv = require('minimist')(process.argv.slice(2));
+var fs = require('fs')
+var createServer = require('../lib/app.js')
+var argv = require('minimist')(process.argv.slice(2))
 
 var options = {
   postgres: process.env.DATABASE_URL
-};
+}
 
-var port = process.env.PORT || 3000;
+var port = process.env.PORT || 3000
 
 if (!argv.http) {
   if (!argv.key || !argv.cert) {
-    console.error('--key and --cert are required');
-    process.exit(1);
+    console.error('--key and --cert are required')
+    process.exit(1)
   }
 
   options.https = {
     key: fs.readFileSync(argv.key),
     cert: fs.readFileSync(argv.cert)
-  };
-
+  }
 }
 
-options.mock = argv.mock;
+options.mock = argv.mock
 
-var server = createServer(options);
-server.listen(port, function() {
+var server = createServer(options)
+
+server.listen(port, function () {
   console.log('lamassu-server listening on port ' + port + ' ' +
-    (argv.http ? '(http)' : '(https)'));
-});
+    (argv.http ? '(http)' : '(https)'))
+})
diff --git a/lib/app.js b/lib/app.js
index 03aae966..2423cdfc 100644
--- a/lib/app.js
+++ b/lib/app.js
@@ -49,17 +49,6 @@ module.exports = function (options) {
 
   app.use(express.bodyParser())
 
-  var reloadConfigMiddleware = function (req, res, next) {
-    lamassuConfig.load(function (err, config) {
-      if (err) {
-        logger.error('Error while reloading config')
-        return next(err)
-      }
-      plugins.configure(config)
-      next()
-    })
-  }
-
   var authMiddleware
 
   if (options.https) {
@@ -110,7 +99,7 @@ module.exports = function (options) {
     lamassuConfig: lamassuConfig,
     plugins: plugins,
     authMiddleware: authMiddleware,
-    reloadConfigMiddleware: reloadConfigMiddleware,
+    // reloadConfigMiddleware: reloadConfigMiddleware,
     mock: options.mock
   })
 
diff --git a/lib/plugins.js b/lib/plugins.js
index 39d1b326..b6eded0a 100644
--- a/lib/plugins.js
+++ b/lib/plugins.js
@@ -555,6 +555,7 @@ function stopTrader (cryptoCode) {
 }
 
 function pollBalance (cryptoCode, cb) {
+  console.trace('pollBalance')
   logger.debug('[%s] collecting balance', cryptoCode)
 
   var walletPlugin = walletPlugins[cryptoCode]
diff --git a/lib/routes.js b/lib/routes.js
index 4cc6aacd..d2940856 100644
--- a/lib/routes.js
+++ b/lib/routes.js
@@ -281,11 +281,10 @@ function init (localConfig) {
   mock = localConfig.mock
 
   var authMiddleware = localConfig.authMiddleware
-  var reloadConfigMiddleware = localConfig.reloadConfigMiddleware
   var app = localConfig.app
   var localApp = localConfig.localApp
 
-  app.get('/poll', authMiddleware, reloadConfigMiddleware, poll)
+  app.get('/poll', authMiddleware, poll)
 
   app.post('/trade', authMiddleware, trade)
   app.post('/send', authMiddleware, send)
diff --git a/todo.txt b/todo.txt
index 2d841d29..163f768a 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1,4 +1,7 @@
 - change satoshis to crypto_atoms in db (ask neal about this)
 
 - on upgrade, make sure we're not sending out lots of notifications
-- fix plugin reloading, in current version and master
+- fix plugin reloading, in current version (v) and master
+- sending two notifications on confirmation
+  - reproduce by setting db record to uncomfirmed, etc
+  - something is being called twice, especially notifyConfirmation