Changeset 68

Timestamp:

11/12/05 23:22:41 (5 years ago)

Author:

dsandler

Message:

See ticket #14. We now only inject feed exceptions into the user's view of
the feed if the exception occurs twice in a row.

Files:

• feedtree/trunk/src/net/feedtree/proxyapp/FeedInfo.java (modified) (4 diffs)
• feedtree/trunk/src/net/feedtree/proxyapp/WebProxyClient.java (modified) (2 diffs)

feedtree/trunk/src/net/feedtree/proxyapp/FeedInfo.java

@@ -232 +232 @@
-    protected SyndFeedOutput m_feedOutput = new SyndFeedOutput();
-    protected Exception     m_errno;
+    protected int           m_errCount;
-    protected Date          m_nextTaskDate;
-    protected Date          m_lastTaskDate;
@@ -344 +345 @@
-        Exception err = m_errno;
-        m_errno = null;
+        m_errCount = 0;
-        return err;
+    }
+
+    protected void setFeedException(Exception e) {
+        m_errno = e;
+        m_errCount++;
+    }
+
+    protected void clearFeedException() {
+        m_errno = null;
+        m_errCount = 0;
-    }
-
-    public Exception peekLastException() {
-        return m_errno;
+    }
+    
+    public int peekLastExceptionCount() {
+        return m_errCount;
-    }
-    
@@ -493 +509 @@
-                
-                if (newEvent) newEntries.add(event);
+
+                clearFeedException();
-            } catch (com.sun.syndication.io.FeedException exc) {
-                // not much we can do---the thing doesn't generate.
-                Logger.global.warning("Couldn't convert SyndEntry (" + entry + ") to IFeedEvent: " + exc);
-m_errno = exc
+setFeedException(exc)
-            }
-        }
@@ -527 +545 @@
-            // Observer: WebProxyClient.
-            // Note: if newEvents.size() == 0, a heartbeat will be generated
+
+            clearFeedException();
+            
-        } catch (Exception e) {
-            Logger.global.warning(">> Couldn't fetch feed " + m_uri + ": " + e);
-            e.printStackTrace(System.out);
-            
-m_errno = e
+setFeedException(e)
-            // will result in an RSS item for the user explaining the
-            // exception

feedtree/trunk/src/net/feedtree/proxyapp/WebProxyClient.java

@@ -57 +57 @@
-    
-    public static long DEFAULT_STALE_FEED_AGE = 7 * DAYS;
+
+    // Number of times an exception must be raised in sequence before it's
+    // reported to the user as a fake RSS item
+    public static int TRANSIENT_EXCEPTION_THRESH = 2;
-
-    public static String FEEDTREE_CLIENT_FEED_TYPE = "atom_0.3";
@@ -382 +386 @@
-                SyndFeed generatedFeed = feed.generateSyndFeed(WebProxyClient.FEED_SIZE, m_appendEntryInfo);
-                
-
+
+
+
-                    ListIterator iter = generatedFeed.getEntries().listIterator();
-