From 0266bdd60cb9cccf20a5ded3eba72ea833bee72d Mon Sep 17 00:00:00 2001
From: Trygve Laugstøl <trygvis@inamo.no>
Date: Tue, 20 Oct 2015 23:18:16 +0200
Subject: o Adding a webapp. o Using di.js as dependency injection framework.

---
 src/Diller.js | 37 ++++++++++++-------------------------
 1 file changed, 12 insertions(+), 25 deletions(-)

(limited to 'src/Diller.js')

diff --git a/src/Diller.js b/src/Diller.js
index eeaf726..a057054 100644
--- a/src/Diller.js
+++ b/src/Diller.js
@@ -1,22 +1,7 @@
-var DillerDao = require('./DillerDao');
-var pgpOptions = {
-  //query: function (e) {
-  //  console.log("Query:", e.query);
-  //  if (e.ctx) {
-  //    // this query is executing inside a task or transaction,
-  //    if (e.ctx.isTX) {
-  //      // this query is inside a transaction;
-  //    } else {
-  //      // this query is inside a task;
-  //    }
-  //
-  //  }
-  //}
-};
-
-var pgp = require('pg-promise')(pgpOptions);
-
-function Diller(config, log) {
+var di = require('di');
+
+function Diller(config, db) {
+  var log = config.log();
 
   function newValue(dao, device, property, value) {
     log.info('new value for device ' + device.key + '/' + property.key + ' = ' + value, {
@@ -47,7 +32,7 @@ function Diller(config, log) {
 
   function updateAggregates(propertyId, timestamp) {
     log.info('Updating aggregates', {propertyId: propertyId, timestamp: timestamp});
-    return pgp(config.postgresqlConfig)
+    return db()
       .tx(function (pg) {
         var dao = new DillerDao(pg);
 
@@ -100,7 +85,7 @@ function Diller(config, log) {
       return;
     }
 
-    return pgp(config.postgresqlConfig)
+    return db()
       .tx(function (pg) {
         var dao = new DillerDao(pg);
 
@@ -136,7 +121,9 @@ function Diller(config, log) {
   }
 }
 
-//noinspection JSUnresolvedVariable
-module.exports = {
-  Diller: Diller
-};
+var DillerConfig = require('./DillerConfig');
+var DillerDao = require('./DillerDao');
+var DillerDb = require('./DillerDb');
+di.annotate(Diller, new di.Inject(DillerConfig, DillerDb));
+
+module.exports = Diller;
-- 
cgit v1.2.3