Author: j16sdiz
Date: 2008-12-11 08:48:58 +0000 (Thu, 11 Dec 2008)
New Revision: 24201

Modified:
   trunk/plugins/XMLSpider/XMLSpider.java
Log:
don't retry immediatly, requeue at the back

Modified: trunk/plugins/XMLSpider/XMLSpider.java
===================================================================
--- trunk/plugins/XMLSpider/XMLSpider.java      2008-12-11 08:40:24 UTC (rev 
24200)
+++ trunk/plugins/XMLSpider/XMLSpider.java      2008-12-11 08:48:58 UTC (rev 
24201)
@@ -392,34 +392,26 @@
                Logger.minor(this, "Failed: [" + tries + "] " + page + " : " + 
fe, fe);
 
                synchronized (this) {
+                       runningFetch.remove(page);
+
                        if (fe.newURI != null) {
                                // redirect, mark as successed
                                queueURI(fe.newURI, "redirect from " + 
state.getURI());
 
-                               runningFetch.remove(page);
                                page.status = Status.SUCCEEDED;
                                page.lastChange = System.currentTimeMillis();
                                db.store(page);
                        } else if (fe.isFatal() || tries > 3) {
                                // too many tries or fatal, mark as failed
-                               runningFetch.remove(page);
                                page.status = Status.FAILED;
                                page.lastChange = System.currentTimeMillis();
                                db.store(page);
                        } else if (!stopped) {
-                               // Retry  
-                               // FIXME why? the original version say this 
keep off the cooldown queue
-                               ClientGetter getter = null;
-                               try {
-                                       getter = makeGetter(page, tries + 1);
-                                       getter.start();
-                                       runningFetch.put(page, getter);
-                               } catch (MalformedURLException e) {
-                                       Logger.error(this, 
"IMPOSSIBLE-Malformed URI: " + page, e);
-                               } catch (FetchException e) {
-                                       onFailure(e, getter, 
((MyClientCallback) getter.getClientCallback()).page,
-                                                       ((MyClientCallback) 
getter.getClientCallback()).tries);
-                               }
+                               // requeue at back
+                               page.status = Status.QUEUED;
+                               page.lastChange = System.currentTimeMillis();
+
+                               db.store(page);
                        }
                }
 

_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs

Reply via email to