Merge pull request django#16 from PaulMcMillan/patch-1

add a timeout so we don't get stuck on urls that behave badly.
nanuxbe · Jun 21, 2011 · 6719c75 · 6719c75
2 parents d1065f5 + 2e5fe6f
commit 6719c75
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/django_website/aggregator/management/commands/mark_defunct_feeds.py b/django_website/aggregator/management/commands/mark_defunct_feeds.py
@@ -10,6 +10,7 @@ def handle(self, *args, **kwargs):
         verbose = kwargs.get('verbosity')
         for f in Feed.objects.all():
             try:
+                socket.setdefaulttimeout(15)
                 r = urllib2.urlopen(f.feed_url)
             except urllib2.HTTPError, e:
                 if e.code == 404 or e.code == 500: