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

Adding timeout errors to raven/sentry error reporting.

Browse source
This commit is contained in:
Samuel Clay 2012-10-25 16:09:06 -07:00
parent c0b791a01b
commit 7e281e1d7b
3 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
fabfile.py vendored
View file

@ -33,7 +33,6 @@ env.roledefs ={
'local': ['localhost'],
'app': ['app01.newsblur.com',
'app02.newsblur.com',
'app03.newsblur.com',
'app04.newsblur.com',
],
'dev': ['dev.newsblur.com'],
@ -48,16 +47,16 @@ env.roledefs ={
'db05.newsblur.com',
],
'task': ['task01.newsblur.com',
'task02.newsblur.com',
# 'task02.newsblur.com',
'task03.newsblur.com',
'task04.newsblur.com',
'task05.newsblur.com',
'task06.newsblur.com',
'task07.newsblur.com',
'task08.newsblur.com',
'task09.newsblur.com',
'task10.newsblur.com',
'task11.newsblur.com',
# 'task08.newsblur.com',
# 'task09.newsblur.com',
# 'task10.newsblur.com',
# 'task11.newsblur.com',
],
'ec2task': ['ec2-54-242-38-48.compute-1.amazonaws.com',
'ec2-184-72-214-147.compute-1.amazonaws.com',

2
settings.py
View file

@ -4,6 +4,7 @@ import os
import datetime
from mongoengine import connect
from boto.s3.connection import S3Connection
import raven
import redis
from utils import jammit
@ -456,6 +457,7 @@ DEBUG_TOOLBAR_CONFIG = {
'SHOW_TOOLBAR_CALLBACK': custom_show_toolbar,
'HIDE_DJANGO_SQL': False,
}
raven_client = raven.Client(SENTRY_DSN)
# =========
# = Mongo =

5
utils/feed_fetcher.py
View file

@ -396,11 +396,12 @@ class Dispatcher:
logging.error(tb)
logging.debug('[%d] ! -------------------------' % (feed_id,))
ret_feed = FEED_ERREXC
feed = Feed.get_by_id(feed.pk or feed_id)
feed = Feed.get_by_id(getattr(feed, 'pk', feed_id))
feed.save_feed_history(500, "Error", tb)
feed_code = 500
fetched_feed = None
mail_feed_error_to_admin(feed, e, local_vars=locals())
settings.raven_client.captureException(e)
if not feed_code:
if ret_feed == FEED_OK:
@ -443,6 +444,7 @@ class Dispatcher:
fetched_feed = None
page_data = None
mail_feed_error_to_admin(feed, e, local_vars=locals())
settings.raven_client.captureException(e)
feed = self.refresh_feed(feed.pk)
logging.debug(u' ---> [%-30s] ~FYFetching icon: %s' % (feed.title[:30], feed.feed_link))
@ -460,6 +462,7 @@ class Dispatcher:
logging.debug('[%d] ! -------------------------' % (feed_id,))
# feed.save_feed_history(560, "Icon Error", tb)
mail_feed_error_to_admin(feed, e, local_vars=locals())
settings.raven_client.captureException(e)
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]'))