o Dropping the app concept.

o Switching to pg-promise to not get overloaded by callbacks.

1 files changed, 4 insertions, 37 deletions

diff --git a/diller.js b/diller.js
index aaad6c1..cfaa6a7 100644
--- a/diller.js
+++ b/diller.js
@@ -1,9 +1,6 @@
 var mqtt = require('mqtt');
 var fs = require('fs');
-var _ = require('underscore');
-var winston = require('winston');
 var bunyan = require('bunyan');
-var pg = require('pg');
 
 var config = require('./src/config');
 
@@ -27,7 +24,7 @@ function configureLogging(config) {
     var stat;
     try {
       stat = fs.lstatSync('log');
-    } catch(e) {
+    } catch (e) {
       // Assume this to to be ENOENT
       fs.mkdirSync('log');
     }
@@ -41,35 +38,9 @@ function configureLogging(config) {
 
 var log = configureLogging(config);
 
-var pgClient = new pg.Client(config.postgresqlUrl);
-pgClient.connect();
-pgClient.on('connect', function () {
-  log.info('connected to pg');
-});
-
-var apps = [
-  './apps/logger',
-  './apps/device',
-  './apps/values'
-];
-
-appConfig = {
-  pg: {
-    connect: function (cb) {
-      pg.connect(config.postgresqlUrl, cb);
-    }
-  }
-};
-
-apps = _.map(apps, function (name) {
-  log.info('Loading app: ' + name);
-  var app = require(name);
-  var cfg = _.clone(appConfig);
+var Diller = require('./src/Diller').Diller;
 
-  cfg.log = log.child({app: name});
-  app.init(cfg);
-  return {name: name, instance: app};
-});
+var diller = new Diller(config, log);
 
 log.info('Connecting to ' + config.mqttUrl);
 var mqttClient = mqtt.connect(config.mqttUrl);
@@ -88,9 +59,5 @@ mqttClient.on('connect', function () {
 });
 
 mqttClient.on('message', function (topic, message, payload) {
-  log.info('got message', {message: message.toString()});
-
-  _.each(apps, function (app) {
-    app.instance.onMessage(topic, message, payload);
-  });
+  diller.onMessage(topic, message, payload);
 });