commit 758df379823b400863dd464b19514b2b1191d37c
author Jason Peterson <jasonpet@us.ibm.com> Mon Aug 14 13:18:45 2017 -0400
committer Justin Berstler <bjustin@us.ibm.com> Mon Aug 14 13:18:45 2017 -0400
tree ef7fb7e5c9950e615628e39188a39a8159edf3aa
parent 7f18fd63309e96590bacb3a4b5fd2173390b8c73

DB view should filter out disabled triggers (#124)

provider/app.js

diff --git a/provider/app.js b/provider/app.js
index 2746a54..3d90fd3 100644
--- a/provider/app.js
+++ b/provider/app.js
@@ -63,7 +63,7 @@
                     views: {
                         triggers_by_worker: {
                             map: function (doc) {
-                                if (doc.maxTriggers) {
+                                if (doc.maxTriggers && (!doc.status || doc.status.active === true)) {
                                     emit(doc.worker || 'worker0', 1);
                                 }
                             }.toString(),

provider/lib/utils.js

diff --git a/provider/lib/utils.js b/provider/lib/utils.js
index 56fe02d..bca66cb 100644
--- a/provider/lib/utils.js
+++ b/provider/lib/utils.js
@@ -276,7 +276,7 @@
                     var triggerIdentifier = trigger.id;
                     var doc = trigger.doc;
 
-                    if ((!doc.status || doc.status.active === true) && !(triggerIdentifier in utils.triggers)) {
+                    if (!(triggerIdentifier in utils.triggers)) {
                         //check if trigger still exists in whisk db
                         var triggerObj = utils.parseQName(triggerIdentifier);
                         var host = 'https://' + utils.routerHost + ':' + 443;