WIP

lib/app.js

@@ -24,63 +24,71 @@ module.exports = function (options) {
 
   console.log('DEBUG6')
 
-  configManager.load()
+  return configManager.load()
   .then(config => {
     console.log('DEBUG5: %j', config)
+    console.log('DEBUG8 ****************')
+
     plugins.configure(config)
+    console.log('DEBUG9.1 ****************')
     plugins.startPolling()
+    console.log('DEBUG9.2 ****************')
     plugins.startCheckingNotification()
-  })
+    console.log('DEBUG9.3 ****************')
 
-  app.use(bodyParser.json())
+    app.use(bodyParser.json())
 
-  var authMiddleware
+    console.log('DEBUG9 ****************')
 
-  if (options.https) {
-    var serverOptions = {
-      key: options.https.key,
-      cert: options.https.cert,
-      requestCert: true,
-      secureProtocol: 'TLSv1_method',
-      ciphers: 'AES128-GCM-SHA256:RC4:HIGH:!MD5:!aNULL:!EDH',
-      honorCipherOrder: true
+    var authMiddleware
+
+    if (options.https) {
+      var serverOptions = {
+        key: options.https.key,
+        cert: options.https.cert,
+        requestCert: true,
+        secureProtocol: 'TLSv1_method',
+        ciphers: 'AES128-GCM-SHA256:RC4:HIGH:!MD5:!aNULL:!EDH',
+        honorCipherOrder: true
+      }
+
+      server = https.createServer(serverOptions, app)
+
+      authMiddleware = function (req, res, next) {
+        next()  // TODO: authentication
+      }
+    } else {
+      server = http.createServer(app)
+
+      authMiddleware = function (req, res, next) {
+        req.device = {}
+        console.log('DEBUG2')
+        console.log(req.route)
+        return next()
+      }
     }
 
-    server = https.createServer(serverOptions, app)
+    if (options.mock) logger.info('In mock mode')
 
-    authMiddleware = function (req, res, next) {
-      next()  // TODO: authentication
-    }
-  } else {
-    server = http.createServer(app)
+    var localApp = express()
+    localApp.use(bodyParser.json())
+    var localServer = http.createServer(localApp)
+    var localPort = 7070
 
-    authMiddleware = function (req, res, next) {
-      req.device = {}
-      console.log('DEBUG2')
-      console.log(req.route)
-      return next()
-    }
-  }
+    console.log('DEBUG7 ****************')
+    routes.init({
+      app: app,
+      localApp: localApp,
+      plugins: plugins,
+      authMiddleware: authMiddleware,
+      // reloadConfigMiddleware: reloadConfigMiddleware,
+      mock: options.mock
+    })
 
-  if (options.mock) logger.info('In mock mode')
+    localServer.listen(7070, function () {
+      console.log('lamassu-server is listening on local port %d', localPort)
+    })
 
-  var localApp = express()
-  localApp.use(bodyParser.json())
-  var localServer = http.createServer(localApp)
-  var localPort = 7070
-
-  routes.init({
-    app: app,
-    localApp: localApp,
-    plugins: plugins,
-    authMiddleware: authMiddleware,
-    // reloadConfigMiddleware: reloadConfigMiddleware,
-    mock: options.mock
+    return server
   })
-
-  localServer.listen(7070, function () {
-    console.log('lamassu-server is listening on local port %d', localPort)
-  })
-
-  return server
 }