removing nano auth logic and associated cookie usage, commenting out
code for now
diff --git a/app.js b/app.js
index 5670383..8d61ac6 100644
--- a/app.js
+++ b/app.js
@@ -80,10 +80,12 @@
var nanop = null;
+ // no need for a promise here, but leaving code inplace until we prove out the question of cookie usage
var promise = new Promise(function(resolve, reject) {
nanop = require('nano')(dbProtocol + '://' + dbHost + ':' + dbPort);
logger.info('url is ' + dbProtocol + '://' + dbHost + ':' + dbPort);
+ /*
nanop.auth(dbUsername, dbPassword, function (err, body, headers) {
if (err) {
reject(err);
@@ -92,7 +94,9 @@
resolve(createDatabase (nanop));
}
});
-
+ */
+ resolve(createDatabase (nanop));
+
});
return promise;
diff --git a/lib/utils.js b/lib/utils.js
index 3e76be8..ca4d641 100644
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -66,8 +66,10 @@
logger.info(tid, method,'found trigger accounturl: ', dbURL);
nanoConnection = require('nano')(dbURL);
+ // no need for a promise here, but leaving code inplace until we prove out the question of cookie usage
return new Promise(function(resolve, reject) {
-
+
+ /*
nanoConnection.auth(dataTrigger.user, dataTrigger.pass, function (err, body, headers) {
if (err) {
@@ -103,6 +105,29 @@
}
});
+ */
+ var triggeredDB = nanoConnection.use(dataTrigger.dbname);
+ // Listen for changes on this database.
+ var feed = triggeredDB.follow({since: sinceToUse, include_docs: dataTrigger.includeDoc});
+
+ dataTrigger.feed = feed;
+ that.triggers[dataTrigger.id] = dataTrigger;
+
+ feed.on('change', function (change) {
+ var triggerHandle = that.triggers[dataTrigger.id];
+ logger.info(tid, method, 'Got change from', dataTrigger.dbname, change);
+ if(triggerHandle && triggerHandle.triggersLeft > 0 && triggerHandle.retriesLeft > 0) {
+ try {
+ that.invokeWhiskAction(dataTrigger.id, change);
+ } catch (e) {
+ logger.error(tid, method, 'Exception occurred in callback', e);
+ }
+ }
+ });
+
+ feed.follow();
+
+ resolve(feed);
}).then(function(feed) {
