diff --git a/apps/rss_feeds/models.py b/apps/rss_feeds/models.py index 26fa944ba..b9f509716 100644 --- a/apps/rss_feeds/models.py +++ b/apps/rss_feeds/models.py @@ -1084,7 +1084,7 @@ class Feed(models.Model): def queue_pushed_feed_xml(self, xml): - logging.debug(' ---> [%-30s] Queuing pushed stories...' % (unicode(self)[:30])) + logging.debug(' ---> [%-30s] [%s] ~FKQueuing pushed stories...' % (unicode(self)[:30], self.pk)) publisher = Task.get_publisher() diff --git a/utils/munin/newsblur_feed_counts.py b/utils/munin/newsblur_feed_counts.py index 138aa8032..fb00d4714 100755 --- a/utils/munin/newsblur_feed_counts.py +++ b/utils/munin/newsblur_feed_counts.py @@ -12,6 +12,7 @@ graph_config = { 'active_feeds.label': 'active_feeds', 'known_good_feeds.label': 'known_good', 'push_feeds.label': 'push_feeds', + 'push_feeds_failed.label': 'push_feeds_failed', } def calculate_metrics(): from apps.rss_feeds.models import Feed, DuplicateFeed @@ -24,7 +25,8 @@ def calculate_metrics(): 'duplicate_feeds': DuplicateFeed.objects.count(), 'active_feeds': Feed.objects.filter(active_subscribers__gt=0).count(), 'known_good_feeds': Feed.objects.filter(known_good=True).count(), - 'push_feeds': PushSubscription.objects.count(), + 'push_feeds': PushSubscription.objects.filter(verified=True).count(), + 'push_feeds_failed': PushSubscription.objects.filter(verified=False).count(), } if __name__ == '__main__':