diff --git a/apps/push/models.py b/apps/push/models.py index 29f608f3f..1180d771d 100644 --- a/apps/push/models.py +++ b/apps/push/models.py @@ -48,7 +48,7 @@ class PushSubscriptionManager(models.Manager): # raise TypeError('callback cannot be None if there is not a reverable URL') # else: # # callback = 'http://' + Site.objects.get_current() + callback_path - callback = "http://push.newsblur.com/push/%s" % subscription.pk # + callback_path + callback = "https://push.newsblur.com/push/%s" % subscription.pk # + callback_path try: response = self._send_request(hub, { diff --git a/utils/monitor_task_fetches.py b/utils/monitor_task_fetches.py index 90e5f9771..396bf05ab 100755 --- a/utils/monitor_task_fetches.py +++ b/utils/monitor_task_fetches.py @@ -31,8 +31,11 @@ def main(): except Exception as e: failed = e - if feeds_fetched < 5000000 and feeds_fetched <= (redis_task_fetches - FETCHES_DROP_AMOUNT): - failed = True + if feeds_fetched < 5000000: + if redis_task_fetches > 0 and feeds_fetched <= (redis_task_fetches - FETCHES_DROP_AMOUNT): + failed = True + elif redis_task_fetches <= 0: + failed = True if failed: requests.post(