Don't immediately retry broken feeds.

diff --git a/NEWS b/NEWS
index cfc11353dbb52f69f26474fb7ae039edef1dd277..fc80ddcbd543867cb22e0fa04b65683db16af661 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+- rawdog 1.3
+
+Reverted the "retry immediately" behaviour from 1.2, since it causes denied or
+broken feeds to get checked every time rawdog is run.
+
 - rawdog 1.2
 
 Updated feedparser to 2.5.2, which fixes a bug that was making rawdog

diff --git a/rawdoglib/rawdog.py b/rawdoglib/rawdog.py
index 960603676a84f44479ccc099ec082cc088e6e266..32818a69cbe2145a5d83d247e6ffe3dbddbcb27a 100644 (file)
--- a/rawdoglib/rawdog.py
+++ b/rawdoglib/rawdog.py
@@ -91,6 +91,8 @@ class Feed:
                        error = "The feed returned an error.\n"
                        error += "If this condition persists, you should remove it from your config file."
 
+               self.last_update = now
+
                if error is not None:
                        print "Feed:        " + self.url
                        if status is not None:
@@ -100,8 +102,6 @@ class Feed:
                        if not non_fatal:
                                return 0
 
-               self.last_update = now
-
                self.etag = p.get("etag")
                self.modified = p.get("modified")
                # In the event that the feed hasn't changed, then both channel