diff options
author | Trygve Laugstøl <trygvis@inamo.no> | 2015-10-20 23:18:16 +0200 |
---|---|---|
committer | Trygve Laugstøl <trygvis@inamo.no> | 2015-10-20 23:18:16 +0200 |
commit | 0266bdd60cb9cccf20a5ded3eba72ea833bee72d (patch) | |
tree | d727bad80aeaef673f48bbbc171fb4e9297b72fc /src/Diller.js | |
parent | 73d272ffe8954b3169901eda74428bad3d2740fe (diff) | |
download | diller-server-0266bdd60cb9cccf20a5ded3eba72ea833bee72d.tar.gz diller-server-0266bdd60cb9cccf20a5ded3eba72ea833bee72d.tar.bz2 diller-server-0266bdd60cb9cccf20a5ded3eba72ea833bee72d.tar.xz diller-server-0266bdd60cb9cccf20a5ded3eba72ea833bee72d.zip |
o Adding a webapp.
o Using di.js as dependency injection framework.
Diffstat (limited to 'src/Diller.js')
-rw-r--r-- | src/Diller.js | 37 |
1 files changed, 12 insertions, 25 deletions
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; |