jshint cleanup and removing unused npm packages
diff --git a/actions/changes.js b/actions/changes.js
index 9b0ef08..665073a 100644
--- a/actions/changes.js
+++ b/actions/changes.js
@@ -19,7 +19,7 @@
var host = msg.host;
var maxTriggers = msg.maxTriggers || 1000;
- if (lifecycleEvent == 'CREATE') {
+ if (lifecycleEvent === 'CREATE') {
// auth key for trigger
var apiKey = msg.authKey;
var auth = apiKey.split(':');
@@ -36,7 +36,7 @@
input["callback"]["action"]["name"] = trigger;
return cloudantHelper(provider_endpoint, 'put', replaceNameTrigger, auth, input);
- } else if (lifecycleEvent == 'DELETE') {
+ } else if (lifecycleEvent === 'DELETE') {
return cloudantHelper(provider_endpoint, 'delete', replaceNameTrigger);
} else {
return whisk.error('operation is neither CREATE or DELETE');
@@ -54,7 +54,7 @@
options.auth = {
user : auth[0],
pass : auth[1]
- }
+ };
}
if (verb === 'put') {
@@ -64,7 +64,7 @@
var promise = new Promise(function(resolve, reject) {
request(options, function(error, response, body) {
console.log('cloudant trigger feed: done http request', '[error:]', error);
- if (!error && response.statusCode == 200) {
+ if (!error && response.statusCode === 200) {
console.log(body);
resolve();
} else {
diff --git a/app.js b/app.js
index 76eeb12..5b5adc4 100644
--- a/app.js
+++ b/app.js
@@ -44,7 +44,6 @@
// If it does not already exist, create the triggers database. This is the database that will
// store the managed triggers.
//
-var dbProvider = process.env.DB_PROVIDER;
var dbUsername = process.env.DB_USERNAME;
var dbPassword = process.env.DB_PASSWORD;
var dbHost = process.env.DB_HOST;
@@ -86,16 +85,6 @@
nanop = require('nano')(dbProtocol + '://' + dbUsername + ':' + dbPassword + '@' + dbHost);
logger.info('url is ' + dbProtocol + '://' + dbUsername + ':' + dbPassword + '@' + dbHost);
- /*
- nanop.auth(dbUsername, dbPassword, function (err, body, headers) {
- if (err) {
- reject(err);
- } else {
- nanop = require('nano')({url: dbProtocol + '://' + dbHost + ':' + dbPort, cookie: headers['set-cookie']});
- resolve(createDatabase (nanop));
- }
- });
- */
resolve(createDatabase (nanop));
});
@@ -120,7 +109,7 @@
logger.info(tid, 'init', 'trigger storage database details: ', nanoDb);
- var providerUtils = new ProviderUtils (tid, logger, app, retriesBeforeDelete, nanoDb, dbProvider, triggerFireLimit, routerHost);
+ var providerUtils = new ProviderUtils (tid, logger, app, retriesBeforeDelete, nanoDb, triggerFireLimit, routerHost);
var providerRAS = new ProviderRAS (tid, logger, providerUtils);
var providerHealth = new ProviderHealth (tid, logger, providerUtils);
var providerUpdate = new ProviderUpdate (tid, logger, providerUtils);
@@ -145,8 +134,7 @@
providerUtils.initAllTriggers();
}, function(err) {
logger.info(tid, 'init', 'found an error creating database: ', err);
- })
- ///
+ });
}
diff --git a/lib/create.js b/lib/create.js
index 99ee1bf..a7d5080 100644
--- a/lib/create.js
+++ b/lib/create.js
@@ -43,4 +43,4 @@
};
-}
+};
diff --git a/lib/delete.js b/lib/delete.js
index 72bb592..b1c68eb 100644
--- a/lib/delete.js
+++ b/lib/delete.js
@@ -12,4 +12,4 @@
};
-}
+};
diff --git a/lib/ras.js b/lib/ras.js
index 35bef02..c5bf9c2 100644
--- a/lib/ras.js
+++ b/lib/ras.js
@@ -8,4 +8,4 @@
res.send({msg: 'pong'});
};
-}
+};
diff --git a/lib/update.js b/lib/update.js
index 8f87950..8d51570 100644
--- a/lib/update.js
+++ b/lib/update.js
@@ -43,4 +43,4 @@
};
-}
+};
diff --git a/lib/utils.js b/lib/utils.js
index ca4d641..9517475 100644
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -9,7 +9,6 @@
app,
retriesBeforeDelete,
triggerDB,
- dbProvider,
triggersFireLimit,
routerHost
) {
@@ -19,14 +18,14 @@
this.app = app;
this.retriesBeforeDelete = retriesBeforeDelete;
this.triggerDB = triggerDB;
- this.dbProvider = dbProvider;
this.triggersLimit = triggersFireLimit;
this.routerHost = routerHost;
// Log HTTP Requests
app.use(function(req, res, next) {
- if (req.url.indexOf('/cloudanttriggers') === 0)
- logger.info(tid, 'HttpRequest',req.method, req.url);
+ if (req.url.indexOf('/cloudanttriggers') === 0) {
+ logger.info(tid, 'HttpRequest', req.method, req.url);
+ }
next();
});
@@ -60,7 +59,7 @@
// add port if specified
if (dataTrigger.port) {
- dbURL = dbURL + ':' + dataTrigger.port
+ dbURL = dbURL + ':' + dataTrigger.port;
}
logger.info(tid, method,'found trigger accounturl: ', dbURL);
@@ -68,44 +67,6 @@
// 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) {
- logger.info(tid, method,'Error happened during the db connection process: ');
- logger.info(tid, method,'dbURL: ' + dbURL);
- logger.info(tid, method,'dataTrigger.user: ' + dataTrigger.user);
- logger.info(tid, method,'dataTrigger.pass: ' + dataTrigger.pass);
- reject(err);
- } else {
- nanoConnection = require('nano')({url: dbURL, cookie: headers['set-cookie']});
- 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);
- }
-
- });
- */
var triggeredDB = nanoConnection.use(dataTrigger.dbname);
// Listen for changes on this database.
var feed = triggeredDB.follow({since: sinceToUse, include_docs: dataTrigger.includeDoc});
@@ -176,7 +137,7 @@
this.initTrigger = function (obj, id) {
logger.info(tid, 'initTrigger', obj);
- var includeDoc = ((obj.includeDoc == true || obj.includeDoc.toString().trim().toLowerCase() == 'true')) || "false";
+ var includeDoc = ((obj.includeDoc === true || obj.includeDoc.toString().trim().toLowerCase() === 'true')) || "false";
var trigger = {
id: id,
accounturl: obj.accounturl,
@@ -331,10 +292,12 @@
}
if(dataTrigger.triggersLeft === 0 || dataTrigger.retriesLeft === 0) {
- if(dataTrigger.triggersLeft === 0)
+ if(dataTrigger.triggersLeft === 0) {
logger.info(tid, 'onTick', 'no more triggers left, deleting');
- if(dataTrigger.retriesLeft === 0)
+ }
+ if(dataTrigger.retriesLeft === 0) {
logger.info(tid, 'onTick', 'too many retries, deleting');
+ }
that.deleteTriggerFromDB(dataTrigger.id);
}
@@ -361,6 +324,6 @@
this.authorize = function(req, res, next) {
next();
- }
+ };
};
diff --git a/package.json b/package.json
index afa0a94..c02f125 100644
--- a/package.json
+++ b/package.json
@@ -7,14 +7,12 @@
},
"dependencies": {
"body-parser": "^1.12.0",
- "cradle": "^0.6.7",
"agentkeepalive": "^2.2.0",
"express": "^4.12.2",
"winston": "^2.1.1",
"moment": "^2.11.1",
"lodash": "^3.10.1",
"request": "2.69.0",
- "when": "^3.7.4",
"nano": "^6.2.0"
}
}
\ No newline at end of file
