Django 1.3-izing everything. Moving logging back to counting everythi…

…ng in the last day, but without the hard-work of deleting old entries.
samuelclay · May 1, 2011 · f8583ad · f8583ad
1 parent 6d04024
commit f8583ad
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 20 deletions.
diff --git a/apps/rss_feeds/models.py b/apps/rss_feeds/models.py
@@ -255,17 +255,17 @@ def save_feed_history(self, status_code, message, exception=None):
                           message=message,
                           exception=exception,
                           fetch_date=datetime.datetime.utcnow()).save()
-        day_ago = datetime.datetime.now() - datetime.timedelta(hours=24)
-        new_fetch_histories = MFeedFetchHistory.objects(feed_id=self.pk, fetch_date__gte=day_ago)
-        if new_fetch_histories.count() < 5 or True:
-            old_fetch_histories = MFeedFetchHistory.objects(feed_id=self.pk)[5:]
-        else:
-            old_fetch_histories = MFeedFetchHistory.objects(feed_id=self.pk, fetch_date__lte=day_ago)
-        for history in old_fetch_histories:
-            history.delete()
+        # day_ago = datetime.datetime.now() - datetime.timedelta(hours=24)
+        # new_fetch_histories = MFeedFetchHistory.objects(feed_id=self.pk, fetch_date__gte=day_ago)
+        # if new_fetch_histories.count() < 5 or True:
+        #     old_fetch_histories = MFeedFetchHistory.objects(feed_id=self.pk)[5:]
+        # else:
+        #     old_fetch_histories = MFeedFetchHistory.objects(feed_id=self.pk, fetch_date__lte=day_ago)
+        # for history in old_fetch_histories:
+        #     history.delete()
         if status_code not in (200, 304):
             fetch_history = map(lambda h: h.status_code, 
-                                MFeedFetchHistory.objects(feed_id=self.pk))
+                                MFeedFetchHistory.objects(feed_id=self.pk)[:10])
             self.count_errors_in_history(fetch_history, status_code, 'feed')
         elif self.has_feed_exception:
             self.has_feed_exception = False
@@ -278,13 +278,13 @@ def save_page_history(self, status_code, message, exception=None):
                           message=message,
                           exception=exception,
                           fetch_date=datetime.datetime.utcnow()).save()
-        old_fetch_histories = MPageFetchHistory.objects(feed_id=self.pk).order_by('-fetch_date')[5:]
-        for history in old_fetch_histories:
-            history.delete()
+        # old_fetch_histories = MPageFetchHistory.objects(feed_id=self.pk).order_by('-fetch_date')[5:]
+        # for history in old_fetch_histories:
+        #     history.delete()
 
         if status_code not in (200, 304):
             fetch_history = map(lambda h: h.status_code, 
-                                MPageFetchHistory.objects(feed_id=self.pk))
+                                MPageFetchHistory.objects(feed_id=self.pk)[:10])
             self.count_errors_in_history(fetch_history, status_code, 'page')
         elif self.has_page_exception:
             self.has_page_exception = False
@@ -1070,7 +1070,7 @@ class MFeedFetchHistory(mongo.Document):
         'collection': 'feed_fetch_history',
         'allow_inheritance': False,
         'ordering': ['-fetch_date'],
-        'indexes': [('fetch_date', 'status_code'), ('feed_id', 'status_code'), ('feed_id', 'fetch_date')],
+        'indexes': [('fetch_date', 'status_code'), ('feed_id', 'status_code'), ('feed_id', '-fetch_date')],
     }
 
     def save(self, *args, **kwargs):
@@ -1080,7 +1080,7 @@ def save(self, *args, **kwargs):
 
     @classmethod
     def feed_history(cls, feed_id):
-        fetches = cls.objects(feed_id=feed_id).order_by('-fetch_date')
+        fetches = cls.objects(feed_id=feed_id).order_by('-fetch_date')[:5]
         fetch_history = []
         for fetch in fetches:
             history                = {}
@@ -1113,7 +1113,7 @@ def save(self, *args, **kwargs):
 
     @classmethod
     def feed_history(cls, feed_id):
-        fetches = cls.objects(feed_id=feed_id).order_by('-fetch_date')
+        fetches = cls.objects(feed_id=feed_id).order_by('-fetch_date')[:5]
         fetch_history = []
         for fetch in fetches:
             history                = {}

diff --git a/apps/statistics/models.py b/apps/statistics/models.py
@@ -1,7 +1,7 @@
 import datetime
 import mongoengine as mongo
 from django.db.models import Avg, Count
-from apps.rss_feeds.models import MFeedFetchHistory, FeedLoadtime
+from apps.rss_feeds.models import MFeedFetchHistory, MPageFetchHistory, FeedLoadtime
 from apps.profile.models import Profile
 from utils import json_functions as json
 
@@ -49,6 +49,13 @@ def collect_statistics_feeds_fetched(cls, last_day=None):
         feeds_fetched = MFeedFetchHistory.objects(fetch_date__gte=last_day).count()
         cls.objects(key='feeds_fetched').update_one(upsert=True, key='feeds_fetched', value=feeds_fetched)
 
+        old_fetch_histories = MFeedFetchHistory.objects(fetch_date__lte=last_day)
+        for history in old_fetch_histories:
+            history.delete()
+        old_page_histories = MPageFetchHistory.objects(fetch_date__lte=last_day)
+        for history in old_page_histories:
+            history.delete()
+
         return feeds_fetched
 
     @classmethod

diff --git a/media/js/newsblur/reader_preferences.js b/media/js/newsblur/reader_preferences.js
@@ -280,6 +280,25 @@ NEWSBLUR.ReaderPreferences.prototype = {
                         'Feed view styling'
                     ])
                 ]),
+                $.make('div', { className: 'NB-preference NB-preference-tooltips' }, [
+                    $.make('div', { className: 'NB-preference-options' }, [
+                        $.make('div', [
+                            $.make('input', { id: 'NB-preference-tooltips-1', type: 'radio', name: 'show_tooltips', value: 1 }),
+                            $.make('label', { 'for': 'NB-preference-tooltips-1' }, [
+                                'Show tooltips'
+                            ])
+                        ]),
+                        $.make('div', [
+                            $.make('input', { id: 'NB-preference-tooltips-2', type: 'radio', name: 'show_tooltips', value: 0 }),
+                            $.make('label', { 'for': 'NB-preference-tooltips-2' }, [
+                                'Don\'t bother showing tooltips.'
+                            ])
+                        ])
+                    ]),
+                    $.make('div', { className: 'NB-preference-label'}, [
+                        'Tooltips'
+                    ])
+                ]),
                 $.make('div', { className: 'NB-preference NB-preference-story-share' }, [
                     $.make('div', { className: 'NB-preference-options' }, [
                         $.make('div', { className: 'NB-preference-option', title: 'Twitter' }, [
@@ -419,6 +438,12 @@ NEWSBLUR.ReaderPreferences.prototype = {
                 return false;
             }
         });
+        $('input[name=show_tooltips]', this.$modal).each(function() {
+            if ($(this).val() == NEWSBLUR.Preferences.show_tooltips) {
+                $(this).attr('checked', true);
+                return false;
+            }
+        });
         $('input[name=story_styling]', this.$modal).each(function() {
             if ($(this).val() == NEWSBLUR.Preferences.story_styling) {
                 $(this).attr('checked', true);

diff --git a/settings.py b/settings.py
@@ -63,8 +63,7 @@
 
 TEMPLATE_LOADERS = (
     'django.template.loaders.filesystem.Loader',
-    'django.template.loaders.app_directories.load_template_source',
-    'django.template.loaders.eggs.load_template_source',
+    'django.template.loaders.app_directories.Loader',
 )
 TEMPLATE_CONTEXT_PROCESSORS = (
     "django.contrib.auth.context_processors.auth",

diff --git a/templates/base.html b/templates/base.html
@@ -28,6 +28,7 @@
       'new_window'              : 1,
       'default_view'            : 'page',
       'hide_read_feeds'         : 0,
+      'show_tooltips'           : 1,
       'feed_order'              : 'ALPHABETICAL',
       'hide_story_changes'      : 0,
       'feed_view_single_story'  : 0,

diff --git a/utils/log.py b/utils/log.py
@@ -18,7 +18,7 @@ def getlogger():
     hdlr.setFormatter(formatter)
     logger.addHandler(hdlr)
     logger.setLevel(settings.LOG_LEVEL)
-
+    
     return logger
 
 def user(u, msg):