From 85474565b0a0d92a09fecb14e8bc0afaad7fbc64 Mon Sep 17 00:00:00 2001
From: Trygve Laugstøl <trygvis@inamo.no>
Date: Sun, 1 Nov 2015 15:28:40 +0100
Subject: misc: o Playing around with type annotations.

---
 src/DillerTx.js | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

(limited to 'src/DillerTx.js')

diff --git a/src/DillerTx.js b/src/DillerTx.js
index 85daee5..0f6b2ea 100644
--- a/src/DillerTx.js
+++ b/src/DillerTx.js
@@ -1,19 +1,14 @@
 var di = require('di');
 var _ = require('lodash');
-var DillerConfig = require('./DillerConfig');
-var DillerDao = require('./DillerDao');
-var Diller = require('./Diller');
+var _DillerDao = require('./DillerDao');
+var _Diller = require('./Diller');
+var _DillerConfig = require('./DillerConfig');
 
 var pgpConstructor = require('pg-promise');
 
 var pgp;
 
-/**
- * @param config DillerConfig
- * @returns {Function}
- * @constructor
- */
-function DillerTx(config) {
+function _DillerTx(config) {
   var log = config.log();
 
   function queryLogger(e) {
@@ -30,19 +25,19 @@ function DillerTx(config) {
   }
 
   function connectLogger(client) {
-    log.info('PGP: connect');
+    //log.info('PGP: connect');
   }
 
   function disconnectLogger(client) {
-    log.info('PGP: disconnect');
+    //log.info('PGP: disconnect');
   }
 
   if (!pgp) {
     var pgpOptions = {};
 
     pgpOptions.query = (config.logQueries && queryLogger) || undefined;
-    //pgpOptions.connect = (config.logQueries && connectLogger) || undefined;
-    //pgpOptions.disconnect = (config.logQueries && disconnectLogger) || undefined;
+    pgpOptions.connect = (config.logQueries && connectLogger) || undefined;
+    pgpOptions.disconnect = (config.logQueries && disconnectLogger) || undefined;
 
     pgp = pgpConstructor(pgpOptions);
   }
@@ -51,13 +46,13 @@ function DillerTx(config) {
     var con = pgp(config.postgresqlConfig);
 
     return con.tx(function (pg) {
-      var dao = new DillerDao(con);
-      var diller = new Diller(config, con, dao);
+      var dao = new _DillerDao(con);
+      var diller = new _Diller(config, con, dao);
       return action(pg, dao, diller)
     });
   };
 }
 
-di.annotate(DillerTx, new di.Inject(DillerConfig));
+di.annotate(_DillerTx, new di.Inject(_DillerConfig));
 
-module.exports = DillerTx;
+module.exports = _DillerTx;
-- 
cgit v1.2.3