public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-09-18 21:50:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Using @dcramer's excellent getsentry.com for all exceptions. Turning off exception emails.

Browse source
This commit is contained in:
Samuel Clay 2013-03-20 08:24:11 -07:00
parent ca43ea8555
commit a75554374b
3 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/rss_feeds/page_importer.py
View file

@ -11,7 +11,8 @@ from django.conf import settings
from django.utils.text import compress_string from django.utils.text import compress_string
from utils import log as logging from utils import log as logging
from apps.rss_feeds.models import MFeedPage from apps.rss_feeds.models import MFeedPage
from utils.feed_functions import timelimit, mail_feed_error_to_admin from utils.feed_functions import timelimit
# from utils.feed_functions import mail_feed_error_to_admin
BROKEN_PAGES = [ BROKEN_PAGES = [
'tag:', 'tag:',
@ -120,7 +121,10 @@ class PageImporter(object):
logging.debug(tb) logging.debug(tb)
logging.debug('[%d] ! -------------------------' % (self.feed.id,)) logging.debug('[%d] ! -------------------------' % (self.feed.id,))
self.feed.save_page_history(500, "Error", tb) self.feed.save_page_history(500, "Error", tb)
mail_feed_error_to_admin(self.feed, e, local_vars=locals()) # mail_feed_error_to_admin(self.feed, e, local_vars=locals())
if (not settings.DEBUG and hasattr(settings, 'RAVEN_CLIENT') and
settings.RAVEN_CLIENT):
settings.RAVEN_CLIENT.captureException()
if not urllib_fallback: if not urllib_fallback:
self.fetch_page(urllib_fallback=True) self.fetch_page(urllib_fallback=True)
else: else:

2
settings.py
View file

@ -149,7 +149,7 @@ LOGGING = {
}, },
'loggers': { 'loggers': {
'django.request': { 'django.request': {
'handlers': ['mail_admins'], 'handlers': ['console', 'log_file'],
'level': 'ERROR', 'level': 'ERROR',
'propagate': True, 'propagate': True,
}, },

17
utils/feed_fetcher.py
View file

@ -18,7 +18,8 @@ from apps.statistics.models import MAnalyticsFetcher
from utils import feedparser from utils import feedparser
from utils.story_functions import pre_process_story from utils.story_functions import pre_process_story
from utils import log as logging from utils import log as logging
from utils.feed_functions import timelimit, TimeoutError, mail_feed_error_to_admin, utf8encode from utils.feed_functions import timelimit, TimeoutError, utf8encode
# from utils.feed_functions import mail_feed_error_to_admin
# Refresh feed code adapted from Feedjack. # Refresh feed code adapted from Feedjack.
@ -386,7 +387,7 @@ class Dispatcher:
feed.save_feed_history(500, "Error", tb) feed.save_feed_history(500, "Error", tb)
feed_code = 500 feed_code = 500
fetched_feed = None fetched_feed = None
mail_feed_error_to_admin(feed, e, local_vars=locals()) # mail_feed_error_to_admin(feed, e, local_vars=locals())
if (not settings.DEBUG and hasattr(settings, 'RAVEN_CLIENT') and if (not settings.DEBUG and hasattr(settings, 'RAVEN_CLIENT') and
settings.RAVEN_CLIENT): settings.RAVEN_CLIENT):
settings.RAVEN_CLIENT.captureException() settings.RAVEN_CLIENT.captureException()
@ -431,8 +432,10 @@ class Dispatcher:
feed.save_page_history(550, "Page Error", tb) feed.save_page_history(550, "Page Error", tb)
fetched_feed = None fetched_feed = None
page_data = None page_data = None
mail_feed_error_to_admin(feed, e, local_vars=locals()) # mail_feed_error_to_admin(feed, e, local_vars=locals())
settings.RAVEN_CLIENT.captureException() if (not settings.DEBUG and hasattr(settings, 'RAVEN_CLIENT') and
settings.RAVEN_CLIENT):
settings.RAVEN_CLIENT.captureException()
feed = self.refresh_feed(feed.pk) feed = self.refresh_feed(feed.pk)
logging.debug(u' ---> [%-30s] ~FYFetching icon: %s' % (feed.title[:30], feed.feed_link)) logging.debug(u' ---> [%-30s] ~FYFetching icon: %s' % (feed.title[:30], feed.feed_link))
@ -449,8 +452,10 @@ class Dispatcher:
logging.error(tb) logging.error(tb)
logging.debug('[%d] ! -------------------------' % (feed_id,)) logging.debug('[%d] ! -------------------------' % (feed_id,))
# feed.save_feed_history(560, "Icon Error", tb) # feed.save_feed_history(560, "Icon Error", tb)
mail_feed_error_to_admin(feed, e, local_vars=locals()) # mail_feed_error_to_admin(feed, e, local_vars=locals())
settings.RAVEN_CLIENT.captureException() if (not settings.DEBUG and hasattr(settings, 'RAVEN_CLIENT') and
settings.RAVEN_CLIENT):
settings.RAVEN_CLIENT.captureException()
else: else:
logging.debug(u' ---> [%-30s] ~FBSkipping page fetch: (%s on %s stories) %s' % (feed.title[:30], self.feed_trans[ret_feed], feed.stories_last_month, '' if feed.has_page else ' [HAS NO PAGE]')) logging.debug(u' ---> [%-30s] ~FBSkipping page fetch: (%s on %s stories) %s' % (feed.title[:30], self.feed_trans[ret_feed], feed.stories_last_month, '' if feed.has_page else ' [HAS NO PAGE]'))