Do not notify subscriptions with excessive errors

Author: andrewshell

services/notify-subscribers.js

@@ -2,6 +2,7 @@
     "use strict";
 
     const appMessages = require('./app-messages'),
+        config = require('../config'),
         logEvent = require('./log-event'),
         moment = require('moment'),
         mongodb = require('./mongodb'),
@@ -68,6 +69,10 @@
             return false
         }
 
+        if (subscription.ctConsecutiveErrors >= config.maxConsecutiveErrors) {
+            return false;
+        }
+
         return true;
     }
 

test/ping.js

@@ -365,6 +365,49 @@ for (const pingProtocol of ['XML-RPC', 'REST']) {
             }
         });
 
+        it(`should not notify subscribers with excessive errors`, async function () {
+            const feedPath = '/rss.xml',
+                pingPath = '/feedupdated',
+                resourceUrl = mock.serverUrl + feedPath;
+
+            let apiurl = ('http-post' === protocol ? mock.serverUrl : mock.secureServerUrl) + pingPath,
+                notifyProcedure = false;
+
+            if ('xml-rpc' === protocol) {
+                apiurl = mock.serverUrl + '/RPC2';
+                notifyProcedure = 'river.feedUpdated';
+            }
+
+            mock.route('GET', feedPath, 200, '<RSS Feed />');
+            mock.route('POST', pingPath, 200, 'Thanks for the update! :-)');
+            mock.rpc(notifyProcedure, rpcReturnSuccess(true));
+            const subscription = await mongodb.addSubscription(resourceUrl, notifyProcedure, apiurl, protocol);
+            subscription.ctConsecutiveErrors = config.maxConsecutiveErrors;
+            await mongodb.updateSubscription(resourceUrl, subscription);
+
+            let res = await ping(pingProtocol, resourceUrl, returnFormat);
+
+            expect(res).status(200);
+
+            if ('XML-RPC' === pingProtocol) {
+                expect(res.text).xml.equal(rpcReturnSuccess(true));
+            } else {
+                if ('JSON' === returnFormat) {
+                    expect(res.body).deep.equal({ success: true, msg: 'Thanks for the ping.' });
+                } else {
+                    expect(res.text).xml.equal('<result success="true" msg="Thanks for the ping."/>');
+                }
+            }
+
+            expect(mock.requests.GET).property(feedPath).lengthOf(1, `Missing GET ${feedPath}`);
+
+            if ('xml-rpc' === protocol) {
+                expect(mock.requests.RPC2).property(notifyProcedure).lengthOf(0, `Missing XML-RPC call ${notifyProcedure}`);
+            } else {
+                expect(mock.requests.POST).property(pingPath).lengthOf(0, `Missing POST ${pingPath}`);
+            }
+        });
+
     });
 
 } // end for pingProtocol