adding munin probes

2 files changed, 8 insertions, 1 deletions

diff --git a/pyaggr3g470r/controllers/article.py b/pyaggr3g470r/controllers/article.py
index 70b9d2dd..21b4b5e7 100644
--- a/pyaggr3g470r/controllers/article.py
+++ b/pyaggr3g470r/controllers/article.py
@@ -33,6 +33,12 @@ class ArticleController(AbstractController):
                               .filter(*self._to_filters(**filters))
                               .group_by(Article.feed_id).all())
 
+    def count_by_user_id(self, **filters):
+        return dict(db.session.query(Article.user_id,
+                                            func.count(Article.id))
+                              .filter(*self._to_filters(**filters))
+                              .group_by(Article.user_id).all())
+
     def create(self, **attrs):
         # handling special denorm for article rights
         assert 'feed_id' in attrs
diff --git a/pyaggr3g470r/views/api/feed.py b/pyaggr3g470r/views/api/feed.py
index 530f3fef..ae2cd735 100644
--- a/pyaggr3g470r/views/api/feed.py
+++ b/pyaggr3g470r/views/api/feed.py
@@ -3,6 +3,7 @@
 
 from flask import g
 
+import conf
 from pyaggr3g470r.controllers.feed import (FeedController,
                                            DEFAULT_MAX_ERROR,
                                            DEFAULT_LIMIT,
@@ -54,7 +55,7 @@ class FetchableFeedAPI(PyAggAbstractResource):
         if g.user.refresh_rate:
             args['refresh_rate'] = g.user.refresh_rate
 
-        if args.pop('retreive_all'):
+        if args.pop('retreive_all', False):
             contr = self.wider_controller
         else:
             contr = self.controller